X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsymfile-mem.c;h=51a75541e52d22514c512b0f652a8e4d4a44c436;hb=762c164d754fc456aa4764d2ed19cc4a3ec625fb;hp=ef48f7d11820c2dee994b00489f30003b58e81c3;hpb=c33b2f12584e8ae5be0e7a54927194d6b5851623;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index ef48f7d118..51a75541e5 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -1,6 +1,6 @@ /* Reading symbol files from memory. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -45,12 +45,11 @@ #include "symtab.h" #include "gdbcore.h" #include "objfiles.h" -#include "exceptions.h" #include "gdbcmd.h" #include "target.h" #include "value.h" #include "symfile.h" -#include "observer.h" +#include "observable.h" #include "auxv.h" #include "elf/common.h" #include "gdb_bfd.h" @@ -89,9 +88,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, struct bfd *nbfd; struct bfd_section *sec; bfd_vma loadbase; - struct section_addr_info *sai; - unsigned int i; - struct cleanup *cleanup; + symfile_add_flags add_flags = 0; if (bfd_get_flavour (templ) != bfd_target_elf_flavour) error (_("add-symbol-file-from-memory not supported for this target")); @@ -101,48 +98,43 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, if (nbfd == NULL) error (_("Failed to read a valid object file image from memory.")); - gdb_bfd_ref (nbfd); + /* Manage the new reference for the duration of this function. */ + gdb_bfd_ref_ptr nbfd_holder = gdb_bfd_ref_ptr::new_reference (nbfd); + xfree (bfd_get_filename (nbfd)); if (name == NULL) nbfd->filename = xstrdup ("shared object read from target memory"); else nbfd->filename = name; - cleanup = make_cleanup_bfd_unref (nbfd); - if (!bfd_check_format (nbfd, bfd_object)) error (_("Got object file from memory but can't read symbols: %s."), bfd_errmsg (bfd_get_error ())); - sai = alloc_section_addr_info (bfd_count_sections (nbfd)); - make_cleanup (xfree, sai); - i = 0; + section_addr_info sai; for (sec = nbfd->sections; sec != NULL; sec = sec->next) if ((bfd_get_section_flags (nbfd, sec) & (SEC_ALLOC|SEC_LOAD)) != 0) - { - sai->other[i].addr = bfd_get_section_vma (nbfd, sec) + loadbase; - sai->other[i].name = (char *) bfd_get_section_name (nbfd, sec); - sai->other[i].sectindex = sec->index; - ++i; - } - sai->num_sections = i; + sai.emplace_back (bfd_get_section_vma (nbfd, sec) + loadbase, + bfd_get_section_name (nbfd, sec), + sec->index); + + if (from_tty) + add_flags |= SYMFILE_VERBOSE; objf = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd), - from_tty ? SYMFILE_VERBOSE : 0, - sai, OBJF_SHARED, NULL); + add_flags, &sai, OBJF_SHARED, NULL); add_target_sections_of_objfile (objf); /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); - do_cleanups (cleanup); return objf; } static void -add_symbol_file_from_memory_command (char *args, int from_tty) +add_symbol_file_from_memory_command (const char *args, int from_tty) { CORE_ADDR addr; struct bfd *templ; @@ -164,60 +156,17 @@ add_symbol_file_from_memory_command (char *args, int from_tty) symbol_file_add_from_memory (templ, addr, 0, NULL, from_tty); } -/* Arguments for symbol_file_add_from_memory_wrapper. */ - -struct symbol_file_add_from_memory_args -{ - struct bfd *bfd; - CORE_ADDR sysinfo_ehdr; - size_t size; - char *name; - int from_tty; -}; - -/* Wrapper function for symbol_file_add_from_memory, for - catch_exceptions. */ - -static int -symbol_file_add_from_memory_wrapper (struct ui_out *uiout, void *data) -{ - struct symbol_file_add_from_memory_args *args = data; - - symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, args->size, - args->name, args->from_tty); - return 0; -} - -/* Rummage through mappings to find the vsyscall page size. */ - -static int -find_vdso_size (CORE_ADDR vaddr, unsigned long size, - int read, int write, int exec, int modified, - void *data) -{ - struct symbol_file_add_from_memory_args *args = data; - - if (vaddr == args->sysinfo_ehdr) - { - args->size = size; - return 1; - } - return 0; -} - /* Try to add the symbols for the vsyscall page, if there is one. This function is called via the inferior_created observer. */ static void add_vsyscall_page (struct target_ops *target, int from_tty) { - CORE_ADDR sysinfo_ehdr; + struct mem_range vsyscall_range; - if (target_auxv_search (target, AT_SYSINFO_EHDR, &sysinfo_ehdr) > 0 - && sysinfo_ehdr != (CORE_ADDR) 0) + if (gdbarch_vsyscall_range (target_gdbarch (), &vsyscall_range)) { struct bfd *bfd; - struct symbol_file_add_from_memory_args args; if (core_bfd != NULL) bfd = core_bfd; @@ -232,33 +181,30 @@ add_vsyscall_page (struct target_ops *target, int from_tty) format should fix this. */ { warning (_("Could not load vsyscall page " - "because no executable was specified\n" - "try using the \"file\" command first.")); + "because no executable was specified")); return; } - args.bfd = bfd; - args.sysinfo_ehdr = sysinfo_ehdr; - args.size = 0; - if (gdbarch_find_memory_regions_p (target_gdbarch ())) - (void) gdbarch_find_memory_regions (target_gdbarch (), - find_vdso_size, &args); - - args.name = xstrprintf ("system-supplied DSO at %s", - paddress (target_gdbarch (), sysinfo_ehdr)); - /* Pass zero for FROM_TTY, because the action of loading the - vsyscall DSO was not triggered by the user, even if the user - typed "run" at the TTY. */ - args.from_tty = 0; - catch_exceptions (current_uiout, symbol_file_add_from_memory_wrapper, - &args, RETURN_MASK_ALL); + + char *name = xstrprintf ("system-supplied DSO at %s", + paddress (target_gdbarch (), vsyscall_range.start)); + try + { + /* Pass zero for FROM_TTY, because the action of loading the + vsyscall DSO was not triggered by the user, even if the + user typed "run" at the TTY. */ + symbol_file_add_from_memory (bfd, + vsyscall_range.start, + vsyscall_range.length, + name, + 0 /* from_tty */); + } + catch (const gdb_exception &ex) + { + exception_print (gdb_stderr, ex); + } } } - - -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_symfile_mem; - void _initialize_symfile_mem (void) { @@ -272,5 +218,5 @@ _initialize_symfile_mem (void) /* Want to know of each new inferior so that its vsyscall info can be extracted. */ - observer_attach_inferior_created (add_vsyscall_page); + gdb::observers::inferior_created.attach (add_vsyscall_page); }