X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fobjfiles.c;h=34b271e86de2b9e2fa392e9815e8aea291b29c09;hb=b669c95337903d39aa2254e8ea0405c0ac117d24;hp=98e81c48c467cac139b1a635a0414f12033e115a;hpb=76727919ceb590f03ff0f6db08b7ceab5b7aeaff;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 98e81c48c4..34b271e86d 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -1,6 +1,6 @@ /* GDB routines for manipulating objfiles. - Copyright (C) 1992-2018 Free Software Foundation, Inc. + Copyright (C) 1992-2019 Free Software Foundation, Inc. Contributed by Cygnus Support, using pieces from other GDB modules. @@ -144,18 +144,14 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd) storage = ((struct objfile_per_bfd_storage *) bfd_alloc (abfd, sizeof (struct objfile_per_bfd_storage))); + /* objfile_per_bfd_storage is not trivially constructible, must + call the ctor manually. */ + storage = new (storage) objfile_per_bfd_storage (); set_bfd_data (abfd, objfiles_bfd_data, storage); } else - { - storage = (objfile_per_bfd_storage *) - obstack_alloc (&objfile->objfile_obstack, - sizeof (objfile_per_bfd_storage)); - } - - /* objfile_per_bfd_storage is not trivially constructible, must - call the ctor manually. */ - storage = new (storage) objfile_per_bfd_storage (); + storage + = obstack_new (&objfile->objfile_obstack); /* Look up the gdbarch associated with the BFD. */ if (abfd != NULL) @@ -269,8 +265,7 @@ objfile_register_static_link (struct objfile *objfile, slot = htab_find_slot (objfile->static_links, &lookup_entry, INSERT); gdb_assert (*slot == NULL); - entry = (struct static_link_htab_entry *) obstack_alloc - (&objfile->objfile_obstack, sizeof (*entry)); + entry = XOBNEW (&objfile->objfile_obstack, static_link_htab_entry); entry->block = block; entry->static_link = static_link; *slot = (void *) entry; @@ -374,8 +369,8 @@ build_objfile_section_table (struct objfile *objfile) objfile::objfile (bfd *abfd, const char *name, objfile_flags flags_) : flags (flags_), pspace (current_program_space), - obfd (abfd), - psymbol_cache (psymbol_bcache_init ()) + partial_symtabs (new psymtab_storage ()), + obfd (abfd) { const char *expanded_name; @@ -519,7 +514,7 @@ objfile_separate_debug_iterate (const struct objfile *parent, /* Put one object file before a specified on in the global list. This can be used to make sure an object file is destroyed before - another when using ALL_OBJFILES_SAFE to free all objfiles. */ + another when using objfiles_safe to free all objfiles. */ void put_objfile_before (struct objfile *objfile, struct objfile *before_this) { @@ -592,7 +587,7 @@ add_separate_debug_objfile (struct objfile *objfile, struct objfile *parent) parent->separate_debug_objfile = objfile; /* Put the separate debug object before the normal one, this is so that - usage of the ALL_OBJFILES_SAFE macro will stay safe. */ + usage of objfiles_safe will stay safe. */ put_objfile_before (objfile, parent); } @@ -718,7 +713,6 @@ objfile::~objfile () } /* Free the obstacks for non-reusable objfiles. */ - psymbol_bcache_free (psymbol_cache); obstack_free (&objfile_obstack, 0); /* Rebuild section map next time we need it. */ @@ -735,17 +729,14 @@ objfile::~objfile () void free_all_objfiles (void) { - struct objfile *objfile, *temp; struct so_list *so; /* Any objfile referencewould become stale. */ for (so = master_so_list (); so; so = so->next) gdb_assert (so->objfile == NULL); - ALL_OBJFILES_SAFE (objfile, temp) - { + for (objfile *objfile : current_program_space->objfiles_safe ()) delete objfile; - } clear_symtab_users (0); } @@ -778,15 +769,13 @@ static int objfile_relocate1 (struct objfile *objfile, const struct section_offsets *new_offsets) { - struct obj_section *s; struct section_offsets *delta = ((struct section_offsets *) alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections))); - int i; int something_changed = 0; - for (i = 0; i < objfile->num_sections; ++i) + for (int i = 0; i < objfile->num_sections; ++i) { delta->offsets[i] = ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i); @@ -798,54 +787,66 @@ objfile_relocate1 (struct objfile *objfile, /* OK, get all the symtabs. */ { - struct compunit_symtab *cust; - struct symtab *s; - - ALL_OBJFILE_FILETABS (objfile, cust, s) - { - struct linetable *l; - int i; - - /* First the line table. */ - l = SYMTAB_LINETABLE (s); - if (l) - { - for (i = 0; i < l->nitems; ++i) - l->item[i].pc += ANOFFSET (delta, - COMPUNIT_BLOCK_LINE_SECTION - (cust)); - } - } - - ALL_OBJFILE_COMPUNITS (objfile, cust) - { - const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (cust); - int block_line_section = COMPUNIT_BLOCK_LINE_SECTION (cust); - - if (BLOCKVECTOR_MAP (bv)) - addrmap_relocate (BLOCKVECTOR_MAP (bv), - ANOFFSET (delta, block_line_section)); - - for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i) - { - struct block *b; - struct symbol *sym; - struct dict_iterator iter; - - b = BLOCKVECTOR_BLOCK (bv, i); - BLOCK_START (b) += ANOFFSET (delta, block_line_section); - BLOCK_END (b) += ANOFFSET (delta, block_line_section); + for (compunit_symtab *cust : objfile->compunits ()) + { + for (symtab *s : compunit_filetabs (cust)) + { + struct linetable *l; + + /* First the line table. */ + l = SYMTAB_LINETABLE (s); + if (l) + { + for (int i = 0; i < l->nitems; ++i) + l->item[i].pc += ANOFFSET (delta, + COMPUNIT_BLOCK_LINE_SECTION + (cust)); + } + } + } - /* We only want to iterate over the local symbols, not any - symbols in included symtabs. */ - ALL_DICT_SYMBOLS (BLOCK_DICT (b), iter, sym) - { - relocate_one_symbol (sym, objfile, delta); - } - } - } + for (compunit_symtab *cust : objfile->compunits ()) + { + const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (cust); + int block_line_section = COMPUNIT_BLOCK_LINE_SECTION (cust); + + if (BLOCKVECTOR_MAP (bv)) + addrmap_relocate (BLOCKVECTOR_MAP (bv), + ANOFFSET (delta, block_line_section)); + + for (int i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i) + { + struct block *b; + struct symbol *sym; + struct mdict_iterator miter; + + b = BLOCKVECTOR_BLOCK (bv, i); + BLOCK_START (b) += ANOFFSET (delta, block_line_section); + BLOCK_END (b) += ANOFFSET (delta, block_line_section); + + if (BLOCK_RANGES (b) != nullptr) + for (int j = 0; j < BLOCK_NRANGES (b); j++) + { + BLOCK_RANGE_START (b, j) + += ANOFFSET (delta, block_line_section); + BLOCK_RANGE_END (b, j) += ANOFFSET (delta, + block_line_section); + } + + /* We only want to iterate over the local symbols, not any + symbols in included symtabs. */ + ALL_DICT_SYMBOLS (BLOCK_MULTIDICT (b), miter, sym) + { + relocate_one_symbol (sym, objfile, delta); + } + } + } } + /* This stores relocated addresses and so must be cleared. This + will cause it to be recreated on demand. */ + objfile->psymbol_map.clear (); + /* Relocate isolated symbols. */ { struct symbol *iter; @@ -854,13 +855,6 @@ objfile_relocate1 (struct objfile *objfile, relocate_one_symbol (iter, objfile, delta); } - if (objfile->psymtabs_addrmap) - addrmap_relocate (objfile->psymtabs_addrmap, - ANOFFSET (delta, SECT_OFF_TEXT (objfile))); - - if (objfile->sf) - objfile->sf->qf->relocate (objfile, new_offsets, delta); - { int i; @@ -872,6 +866,7 @@ objfile_relocate1 (struct objfile *objfile, get_objfile_pspace_data (objfile->pspace)->section_map_dirty = 1; /* Update the table in exec_ops, used to read memory. */ + struct obj_section *s; ALL_OBJFILE_OSECTIONS (objfile, s) { int idx = s - objfile->sections; @@ -1018,13 +1013,11 @@ objfile_has_symbols (struct objfile *objfile) int have_partial_symbols (void) { - struct objfile *ofp; - - ALL_OBJFILES (ofp) - { - if (objfile_has_partial_symbols (ofp)) - return 1; - } + for (objfile *ofp : current_program_space->objfiles ()) + { + if (objfile_has_partial_symbols (ofp)) + return 1; + } return 0; } @@ -1035,13 +1028,11 @@ have_partial_symbols (void) int have_full_symbols (void) { - struct objfile *ofp; - - ALL_OBJFILES (ofp) - { - if (objfile_has_full_symbols (ofp)) - return 1; - } + for (objfile *ofp : current_program_space->objfiles ()) + { + if (objfile_has_full_symbols (ofp)) + return 1; + } return 0; } @@ -1053,17 +1044,14 @@ have_full_symbols (void) void objfile_purge_solibs (void) { - struct objfile *objf; - struct objfile *temp; - - ALL_OBJFILES_SAFE (objf, temp) - { - /* We assume that the solib package has been purged already, or will - be soon. */ + for (objfile *objf : current_program_space->objfiles_safe ()) + { + /* We assume that the solib package has been purged already, or will + be soon. */ - if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED)) - delete objf; - } + if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED)) + delete objf; + } } @@ -1074,15 +1062,13 @@ objfile_purge_solibs (void) int have_minimal_symbols (void) { - struct objfile *ofp; - - ALL_OBJFILES (ofp) - { - if (ofp->per_bfd->minimal_symbol_count > 0) - { - return 1; - } - } + for (objfile *ofp : current_program_space->objfiles ()) + { + if (ofp->per_bfd->minimal_symbol_count > 0) + { + return 1; + } + } return 0; } @@ -1147,9 +1133,7 @@ qsort_cmp (const void *a, const void *b) { /* Sort on sequence number of the objfile in the chain. */ - const struct objfile *objfile; - - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) if (objfile == objfile1) return -1; else if (objfile == objfile2) @@ -1289,8 +1273,7 @@ filter_overlapping_sections (struct obj_section **map, int map_size) struct gdbarch *const gdbarch = get_objfile_arch (objf1); - complaint (&symfile_complaints, - _("unexpected overlap between:\n" + complaint (_("unexpected overlap between:\n" " (A) section `%s' from `%s' [%s, %s)\n" " (B) section `%s' from `%s' [%s, %s).\n" "Will ignore section B"), @@ -1325,7 +1308,6 @@ update_section_map (struct program_space *pspace, struct objfile_pspace_info *pspace_info; int alloc_size, map_size, i; struct obj_section *s, **map; - struct objfile *objfile; pspace_info = get_objfile_pspace_data (pspace); gdb_assert (pspace_info->section_map_dirty != 0 @@ -1335,7 +1317,7 @@ update_section_map (struct program_space *pspace, xfree (map); alloc_size = 0; - ALL_PSPACE_OBJFILES (pspace, objfile) + for (objfile *objfile : pspace->objfiles ()) ALL_OBJFILE_OSECTIONS (objfile, s) if (insert_section_p (objfile->obfd, s->the_bfd_section)) alloc_size += 1; @@ -1351,7 +1333,7 @@ update_section_map (struct program_space *pspace, map = XNEWVEC (struct obj_section *, alloc_size); i = 0; - ALL_PSPACE_OBJFILES (pspace, objfile) + for (objfile *objfile : pspace->objfiles ()) ALL_OBJFILE_OSECTIONS (objfile, s) if (insert_section_p (objfile->obfd, s->the_bfd_section)) map[i++] = s; @@ -1461,26 +1443,11 @@ objfiles_changed (void) /* See comments in objfiles.h. */ -void +scoped_restore_tmpl inhibit_section_map_updates (struct program_space *pspace) { - get_objfile_pspace_data (pspace)->inhibit_updates = 1; -} - -/* See comments in objfiles.h. */ - -void -resume_section_map_updates (struct program_space *pspace) -{ - get_objfile_pspace_data (pspace)->inhibit_updates = 0; -} - -/* See comments in objfiles.h. */ - -void -resume_section_map_updates_cleanup (void *arg) -{ - resume_section_map_updates ((struct program_space *) arg); + return scoped_restore_tmpl + (&get_objfile_pspace_data (pspace)->inhibit_updates, 1); } /* Return 1 if ADDR maps into one of the sections of OBJFILE and 0 @@ -1510,9 +1477,7 @@ int shared_objfile_contains_address_p (struct program_space *pspace, CORE_ADDR address) { - struct objfile *objfile; - - ALL_PSPACE_OBJFILES (pspace, objfile) + for (objfile *objfile : pspace->objfiles ()) { if ((objfile->flags & OBJF_SHARED) != 0 && is_addr_in_objfile (address, objfile)) @@ -1523,7 +1488,7 @@ shared_objfile_contains_address_p (struct program_space *pspace, } /* The default implementation for the "iterate_over_objfiles_in_search_order" - gdbarch method. It is equivalent to use the ALL_OBJFILES macro, + gdbarch method. It is equivalent to use the objfiles iterable, searching the objfiles in the order they are stored internally, ignoring CURRENT_OBJFILE. @@ -1537,9 +1502,8 @@ default_iterate_over_objfiles_in_search_order void *cb_data, struct objfile *current_objfile) { int stop = 0; - struct objfile *objfile; - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) { stop = cb (objfile, cb_data); if (stop)