X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsolib.c;h=962ce32dcf0396c94d3b898851dbde3ba4ffe37d;hb=d16c467a501547e37b111f775396e28f8bf27c1e;hp=e605e6b4cb28709ca8a03b0c362a6da2a3787c5f;hpb=bf4692711232eb96cd840f96d88897a2746d8190;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/solib.c b/gdb/solib.c index e605e6b4cb..962ce32dcf 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1,6 +1,6 @@ /* Handle shared libraries for GDB, the GNU Debugger. - Copyright (C) 1990-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -31,21 +31,23 @@ #include "frame.h" #include "gdb_regex.h" #include "inferior.h" -#include "environ.h" +#include "gdbsupport/environ.h" #include "language.h" #include "gdbcmd.h" #include "completer.h" #include "filenames.h" /* for DOSish file names */ #include "exec.h" #include "solist.h" -#include "observer.h" -#include "readline/readline.h" +#include "observable.h" +#include "readline/tilde.h" #include "remote.h" #include "solib.h" #include "interps.h" #include "filesystem.h" #include "gdb_bfd.h" -#include "filestuff.h" +#include "gdbsupport/filestuff.h" +#include "source.h" +#include "cli/cli-style.h" /* Architecture-specific operations. */ @@ -111,11 +113,9 @@ show_solib_search_path (struct ui_file *file, int from_tty, # define DOS_BASED_FILE_SYSTEM 0 #endif -/* Return the full pathname of a binary file (the main executable - or a shared library file), or NULL if not found. The returned - pathname is malloc'ed and must be freed by the caller. If FD - is non-NULL, *FD is set to either -1 or an open file handle for - the binary file. +/* Return the full pathname of a binary file (the main executable or a + shared library file), or NULL if not found. If FD is non-NULL, *FD + is set to either -1 or an open file handle for the binary file. Global variable GDB_SYSROOT is used as a prefix directory to search for binary files if they have an absolute path. @@ -144,19 +144,18 @@ show_solib_search_path (struct ui_file *file, int from_tty, * If IS_SOLIB is non-zero: * Look in inferior's $LD_LIBRARY_PATH. * - * The last check avoids doing this search when targetting remote + * The last check avoids doing this search when targeting remote * machines since a sysroot will almost always be set. */ -static char * -solib_find_1 (const char *in_pathname, int *fd, int is_solib) +static gdb::unique_xmalloc_ptr +solib_find_1 (const char *in_pathname, int *fd, bool is_solib) { const struct target_so_ops *ops = solib_ops (target_gdbarch ()); int found_file = -1; - char *temp_pathname = NULL; + gdb::unique_xmalloc_ptr temp_pathname; const char *fskind = effective_target_file_system_kind (); - struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); - char *sysroot = gdb_sysroot; + const char *sysroot = gdb_sysroot; int prefix_len, orig_prefix_len; /* If the absolute prefix starts with "target:" but the filesystem @@ -174,12 +173,13 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib) while (prefix_len > 0 && IS_DIR_SEPARATOR (sysroot[prefix_len - 1])) prefix_len--; + std::string sysroot_holder; if (prefix_len == 0) sysroot = NULL; else if (prefix_len != orig_prefix_len) { - sysroot = savestring (sysroot, prefix_len); - make_cleanup (xfree, sysroot); + sysroot_holder = std::string (sysroot, prefix_len); + sysroot = sysroot_holder.c_str (); } /* If we're on a non-DOS-based system, backslashes won't be @@ -215,10 +215,10 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib) */ if (!IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname) || sysroot == NULL) - temp_pathname = xstrdup (in_pathname); + temp_pathname.reset (xstrdup (in_pathname)); else { - int need_dir_separator; + bool need_dir_separator; /* Concatenate the sysroot and the target reported filename. We may need to glue them with a directory separator. Cases to @@ -234,31 +234,28 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib) | target:some/dir | | /foo/bar.dll | IOW, we don't need to add a separator if IN_PATHNAME already - has one, or when the the sysroot is exactly "target:". + has one, or when the sysroot is exactly "target:". There's no need to check for drive spec explicitly, as we only get here if IN_PATHNAME is considered an absolute path. */ need_dir_separator = !(IS_DIR_SEPARATOR (in_pathname[0]) || strcmp (TARGET_SYSROOT_PREFIX, sysroot) == 0); /* Cat the prefixed pathname together. */ - temp_pathname = concat (sysroot, - need_dir_separator ? SLASH_STRING : "", - in_pathname, (char *) NULL); + temp_pathname.reset (concat (sysroot, + need_dir_separator ? SLASH_STRING : "", + in_pathname, (char *) NULL)); } /* Handle files to be accessed via the target. */ - if (is_target_filename (temp_pathname)) + if (is_target_filename (temp_pathname.get ())) { if (fd != NULL) *fd = -1; - do_cleanups (old_chain); return temp_pathname; } /* Now see if we can open it. */ - found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0); - if (found_file < 0) - xfree (temp_pathname); + found_file = gdb_open_cloexec (temp_pathname.get (), O_RDONLY | O_BINARY, 0); /* If the search in gdb_sysroot failed, and the path name has a drive spec (e.g, c:/foo), try stripping ':' from the drive spec, @@ -269,46 +266,41 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib) && sysroot != NULL && HAS_TARGET_DRIVE_SPEC (fskind, in_pathname)) { - int need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]); - char *drive = savestring (in_pathname, 1); + bool need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]); + char drive[2] = { in_pathname[0], '\0' }; - temp_pathname = concat (sysroot, - SLASH_STRING, - drive, - need_dir_separator ? SLASH_STRING : "", - in_pathname + 2, (char *) NULL); - xfree (drive); + temp_pathname.reset (concat (sysroot, + SLASH_STRING, + drive, + need_dir_separator ? SLASH_STRING : "", + in_pathname + 2, (char *) NULL)); - found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0); + found_file = gdb_open_cloexec (temp_pathname.get (), + O_RDONLY | O_BINARY, 0); if (found_file < 0) { - xfree (temp_pathname); - /* If the search in gdb_sysroot still failed, try fully stripping the drive spec, and trying once more in the sysroot before giving up. c:/foo/bar.dll ==> /sysroot/foo/bar.dll. */ - temp_pathname = concat (sysroot, - need_dir_separator ? SLASH_STRING : "", - in_pathname + 2, (char *) NULL); + temp_pathname.reset (concat (sysroot, + need_dir_separator ? SLASH_STRING : "", + in_pathname + 2, (char *) NULL)); - found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0); - if (found_file < 0) - xfree (temp_pathname); + found_file = gdb_open_cloexec (temp_pathname.get (), + O_RDONLY | O_BINARY, 0); } } - do_cleanups (old_chain); - /* We try to find the library in various ways. After each attempt, either found_file >= 0 and temp_pathname is a malloc'd string, or found_file < 0 and temp_pathname does not point to storage that needs to be freed. */ if (found_file < 0) - temp_pathname = NULL; + temp_pathname.reset (NULL); /* If the search in gdb_sysroot failed, and the path name is absolute at this point, make it relative. (openp will try and open the @@ -374,14 +366,13 @@ solib_find_1 (const char *in_pathname, int *fd, int is_solib) } /* Return the full pathname of the main executable, or NULL if not - found. The returned pathname is malloc'ed and must be freed by - the caller. If FD is non-NULL, *FD is set to either -1 or an open - file handle for the main executable. */ + found. If FD is non-NULL, *FD is set to either -1 or an open file + handle for the main executable. */ -char * +gdb::unique_xmalloc_ptr exec_file_find (const char *in_pathname, int *fd) { - char *result; + gdb::unique_xmalloc_ptr result; const char *fskind = effective_target_file_system_kind (); if (in_pathname == NULL) @@ -389,7 +380,7 @@ exec_file_find (const char *in_pathname, int *fd) if (*gdb_sysroot != '\0' && IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname)) { - result = solib_find_1 (in_pathname, fd, 0); + result = solib_find_1 (in_pathname, fd, false); if (result == NULL && fskind == file_system_kind_dos_based) { @@ -399,7 +390,7 @@ exec_file_find (const char *in_pathname, int *fd) strcpy (new_pathname, in_pathname); strcat (new_pathname, ".exe"); - result = solib_find_1 (new_pathname, fd, 0); + result = solib_find_1 (new_pathname, fd, false); } } else @@ -413,7 +404,7 @@ exec_file_find (const char *in_pathname, int *fd) filename. Not much more we can do...) */ if (!source_full_path_of (in_pathname, &result)) - result = xstrdup (in_pathname); + result.reset (xstrdup (in_pathname)); if (fd != NULL) *fd = -1; } @@ -422,14 +413,13 @@ exec_file_find (const char *in_pathname, int *fd) } /* Return the full pathname of a shared library file, or NULL if not - found. The returned pathname is malloc'ed and must be freed by - the caller. If FD is non-NULL, *FD is set to either -1 or an open - file handle for the shared library. + found. If FD is non-NULL, *FD is set to either -1 or an open file + handle for the shared library. The search algorithm used is described in solib_find_1's comment above. */ -char * +gdb::unique_xmalloc_ptr solib_find (const char *in_pathname, int *fd) { const char *solib_symbols_extension @@ -459,19 +449,17 @@ solib_find (const char *in_pathname, int *fd) } } - return solib_find_1 (in_pathname, fd, 1); + return solib_find_1 (in_pathname, fd, true); } /* Open and return a BFD for the shared library PATHNAME. If FD is not -1, it is used as file handle to open the file. Throws an error if the file could not be opened. Handles both local and remote file access. - PATHNAME must be malloc'ed by the caller. It will be freed by this - function. If unsuccessful, the FD will be closed (unless FD was - -1). */ + If unsuccessful, the FD will be closed (unless FD was -1). */ gdb_bfd_ref_ptr -solib_bfd_fopen (char *pathname, int fd) +solib_bfd_fopen (const char *pathname, int fd) { gdb_bfd_ref_ptr abfd (gdb_bfd_open (pathname, gnutarget, fd)); @@ -480,27 +468,25 @@ solib_bfd_fopen (char *pathname, int fd) if (abfd == NULL) { - make_cleanup (xfree, pathname); + /* Arrange to free PATHNAME when the error is thrown. */ error (_("Could not open `%s' as an executable file: %s"), pathname, bfd_errmsg (bfd_get_error ())); } - xfree (pathname); - return abfd; } /* Find shared library PATHNAME and open a BFD for it. */ gdb_bfd_ref_ptr -solib_bfd_open (char *pathname) +solib_bfd_open (const char *pathname) { - char *found_pathname; int found_file; const struct bfd_arch_info *b; /* Search for shared library file. */ - found_pathname = solib_find (pathname, &found_file); + gdb::unique_xmalloc_ptr found_pathname + = solib_find (pathname, &found_file); if (found_pathname == NULL) { /* Return failure if the file could not be found, so that we can @@ -512,19 +498,19 @@ solib_bfd_open (char *pathname) } /* Open bfd for shared library. */ - gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname, found_file)); + gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname.get (), found_file)); /* Check bfd format. */ if (!bfd_check_format (abfd.get (), bfd_object)) error (_("`%s': not in executable format: %s"), - bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ())); + bfd_get_filename (abfd.get ()), bfd_errmsg (bfd_get_error ())); /* Check bfd arch. */ b = gdbarch_bfd_arch_info (target_gdbarch ()); if (!b->compatible (b, bfd_get_arch_info (abfd.get ()))) warning (_("`%s': Shared library architecture %s is not compatible " - "with target architecture %s."), bfd_get_filename (abfd), - bfd_get_arch_info (abfd.get ())->printable_name, + "with target architecture %s."), bfd_get_filename (abfd.get ()), + bfd_get_arch_info (abfd.get ())->printable_name, b->printable_name); return abfd; @@ -669,10 +655,9 @@ master_so_list (void) } /* Read in symbols for shared object SO. If SYMFILE_VERBOSE is set in FLAGS, - be chatty about it. Return non-zero if any symbols were actually - loaded. */ + be chatty about it. Return true if any symbols were actually loaded. */ -int +bool solib_read_symbols (struct so_list *so, symfile_add_flags flags) { if (so->symbols_loaded) @@ -689,56 +674,57 @@ solib_read_symbols (struct so_list *so, symfile_add_flags flags) flags |= current_inferior ()->symfile_flags; - TRY + try { - struct section_addr_info *sap; - /* Have we already loaded this shared object? */ - ALL_OBJFILES (so->objfile) + so->objfile = nullptr; + for (objfile *objfile : current_program_space->objfiles ()) { - if (filename_cmp (objfile_name (so->objfile), so->so_name) == 0 - && so->objfile->addr_low == so->addr_low) - break; + if (filename_cmp (objfile_name (objfile), so->so_name) == 0 + && objfile->addr_low == so->addr_low) + { + so->objfile = objfile; + break; + } } if (so->objfile == NULL) { - sap = build_section_addr_info_from_section_table (so->sections, - so->sections_end); + section_addr_info sap + = build_section_addr_info_from_section_table (so->sections, + so->sections_end); so->objfile = symbol_file_add_from_bfd (so->abfd, so->so_name, - flags, sap, OBJF_SHARED, - NULL); + flags, &sap, + OBJF_SHARED, NULL); so->objfile->addr_low = so->addr_low; - free_section_addr_info (sap); } so->symbols_loaded = 1; } - CATCH (e, RETURN_MASK_ERROR) + catch (const gdb_exception_error &e) { exception_fprintf (gdb_stderr, e, _("Error while reading shared" " library symbols for %s:\n"), so->so_name); } - END_CATCH - return 1; + return true; } - return 0; + return false; } -/* Return 1 if KNOWN->objfile is used by any other so_list object in the - SO_LIST_HEAD list. Return 0 otherwise. */ +/* Return true if KNOWN->objfile is used by any other so_list object in the + SO_LIST_HEAD list. Return false otherwise. */ -static int +static bool solib_used (const struct so_list *const known) { const struct so_list *pivot; for (pivot = so_list_head; pivot != NULL; pivot = pivot->next) if (pivot != known && pivot->objfile == known->objfile) - return 1; - return 0; + return true; + return false; } /* See solib.h. */ @@ -752,7 +738,7 @@ update_solib_list (int from_tty) /* We can reach here due to changing solib-search-path or the sysroot, before having any inferior. */ - if (target_has_execution && !ptid_equal (inferior_ptid, null_ptid)) + if (target_has_execution && inferior_ptid != null_ptid) { struct inferior *inf = current_inferior (); @@ -761,17 +747,16 @@ update_solib_list (int from_tty) symbols now! */ if (inf->attach_flag && symfile_objfile == NULL) { - TRY + try { ops->open_symbol_file_object (from_tty); } - CATCH (ex, RETURN_MASK_ALL) + catch (const gdb_exception &ex) { exception_fprintf (gdb_stderr, ex, "Error reading attached " "process's symbol file.\n"); } - END_CATCH } } @@ -841,17 +826,16 @@ update_solib_list (int from_tty) { /* Notify any observer that the shared object has been unloaded before we remove it from GDB's tables. */ - observer_notify_solib_unloaded (gdb); + gdb::observers::solib_unloaded.notify (gdb); - VEC_safe_push (char_ptr, current_program_space->deleted_solibs, - xstrdup (gdb->so_name)); + current_program_space->deleted_solibs.push_back (gdb->so_name); *gdb_link = gdb->next; /* Unless the user loaded it explicitly, free SO's objfile. */ if (gdb->objfile && ! (gdb->objfile->flags & OBJF_USERLOADED) && !solib_used (gdb)) - free_objfile (gdb->objfile); + gdb->objfile->unlink (); /* Some targets' section tables might be referring to sections from so->abfd; remove them. */ @@ -880,9 +864,9 @@ update_solib_list (int from_tty) { i->pspace = current_program_space; - VEC_safe_push (so_list_ptr, current_program_space->added_solibs, i); + current_program_space->added_solibs.push_back (i); - TRY + try { /* Fill in the rest of the `struct so_list' node. */ if (!solib_map_sections (i)) @@ -893,17 +877,16 @@ update_solib_list (int from_tty) } } - CATCH (e, RETURN_MASK_ERROR) + catch (const gdb_exception_error &e) { exception_fprintf (gdb_stderr, e, _("Error while mapping shared " "library sections:\n")); } - END_CATCH /* Notify any observer that the shared object has been loaded now that we've added it to GDB's tables. */ - observer_notify_solib_loaded (i); + gdb::observers::solib_loaded.notify (i); } /* If a library was not found, issue an appropriate warning @@ -934,7 +917,7 @@ Do you need \"set solib-search-path\" or \"set sysroot\"?"), the file name against "/libpthread". This can lead to false positives, but this should be good enough in practice. */ -int +bool libpthread_name_p (const char *name) { return (strstr (name, "/libpthread") != NULL); @@ -942,7 +925,7 @@ libpthread_name_p (const char *name) /* Return non-zero if SO is the libpthread shared library. */ -static int +static bool libpthread_solib_p (struct so_list *so) { return libpthread_name_p (so->so_name); @@ -989,8 +972,8 @@ solib_add (const char *pattern, int from_tty, int readsyms) symbols for any that match the pattern --- or any whose symbols aren't already loaded, if no pattern was given. */ { - int any_matches = 0; - int loaded_any_symbols = 0; + bool any_matches = false; + bool loaded_any_symbols = false; symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET; if (from_tty) @@ -1007,7 +990,7 @@ solib_add (const char *pattern, int from_tty, int readsyms) const int add_this_solib = (readsyms || libpthread_solib_p (gdb)); - any_matches = 1; + any_matches = true; if (add_this_solib) { if (gdb->symbols_loaded) @@ -1019,7 +1002,7 @@ solib_add (const char *pattern, int from_tty, int readsyms) gdb->so_name); } else if (solib_read_symbols (gdb, add_flags)) - loaded_any_symbols = 1; + loaded_any_symbols = true; } } @@ -1045,10 +1028,10 @@ solib_add (const char *pattern, int from_tty, int readsyms) all. */ static void -info_sharedlibrary_command (char *pattern, int from_tty) +info_sharedlibrary_command (const char *pattern, int from_tty) { struct so_list *so = NULL; /* link map state variable */ - int so_missing_debug_info = 0; + bool so_missing_debug_info = false; int addr_width; int nr_libs; struct gdbarch *gdbarch = target_gdbarch (); @@ -1111,17 +1094,17 @@ info_sharedlibrary_command (char *pattern, int from_tty) uiout->field_skip ("to"); } - if (! interp_ui_out (top_level_interpreter ())->is_mi_like_p () + if (! top_level_interpreter ()->interp_ui_out ()->is_mi_like_p () && so->symbols_loaded && !objfile_has_symbols (so->objfile)) { - so_missing_debug_info = 1; + so_missing_debug_info = true; uiout->field_string ("syms-read", "Yes (*)"); } else uiout->field_string ("syms-read", so->symbols_loaded ? "Yes" : "No"); - uiout->field_string ("name", so->so_name); + uiout->field_string ("name", so->so_name, file_name_style.style ()); uiout->text ("\n"); } @@ -1142,9 +1125,9 @@ info_sharedlibrary_command (char *pattern, int from_tty) } } -/* Return 1 if ADDRESS lies within SOLIB. */ +/* See solib.h. */ -int +bool solib_contains_address_p (const struct so_list *const solib, CORE_ADDR address) { @@ -1152,9 +1135,9 @@ solib_contains_address_p (const struct so_list *const solib, for (p = solib->sections; p < solib->sections_end; p++) if (p->addr <= address && address < p->endaddr) - return 1; + return true; - return 0; + return false; } /* If ADDRESS is in a shared lib in program space PSPACE, return its @@ -1180,21 +1163,17 @@ solib_name_from_address (struct program_space *pspace, CORE_ADDR address) return (0); } -/* Return whether the data starting at VADDR, size SIZE, must be kept - in a core file for shared libraries loaded before "gcore" is used - to be handled correctly when the core file is loaded. This only - applies when the section would otherwise not be kept in the core - file (in particular, for readonly sections). */ +/* See solib.h. */ -int +bool solib_keep_data_in_core (CORE_ADDR vaddr, unsigned long size) { const struct target_so_ops *ops = solib_ops (target_gdbarch ()); if (ops->keep_data_in_core) - return ops->keep_data_in_core (vaddr, size); + return ops->keep_data_in_core (vaddr, size) != 0; else - return 0; + return false; } /* Called by free_all_symtabs */ @@ -1211,7 +1190,7 @@ clear_solib (void) struct so_list *so = so_list_head; so_list_head = so->next; - observer_notify_solib_unloaded (so); + gdb::observers::solib_unloaded.notify (so); remove_target_sections (so); free_so (so); } @@ -1232,21 +1211,20 @@ solib_create_inferior_hook (int from_tty) ops->solib_create_inferior_hook (from_tty); } -/* Check to see if an address is in the dynamic loader's dynamic - symbol resolution code. Return 1 if so, 0 otherwise. */ +/* See solib.h. */ -int +bool in_solib_dynsym_resolve_code (CORE_ADDR pc) { const struct target_so_ops *ops = solib_ops (target_gdbarch ()); - return ops->in_dynsym_resolve_code (pc); + return ops->in_dynsym_resolve_code (pc) != 0; } /* Implements the "sharedlibrary" command. */ static void -sharedlibrary_command (char *args, int from_tty) +sharedlibrary_command (const char *args, int from_tty) { dont_repeat (); solib_add (args, from_tty, 1); @@ -1258,7 +1236,7 @@ sharedlibrary_command (char *args, int from_tty) are not discarded. Also called from remote.c. */ void -no_shared_libraries (char *ignored, int from_tty) +no_shared_libraries (const char *ignored, int from_tty) { /* The order of the two routines below is important: clear_solib notifies the solib_unloaded observers, and some of these observers might need @@ -1313,8 +1291,8 @@ reload_shared_libraries_1 (int from_tty) for (so = so_list_head; so != NULL; so = so->next) { - char *found_pathname = NULL; - int was_loaded = so->symbols_loaded; + const char *found_pathname = NULL; + bool was_loaded = so->symbols_loaded != 0; symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET; if (from_tty) @@ -1334,7 +1312,7 @@ reload_shared_libraries_1 (int from_tty) { if (so->objfile && ! (so->objfile->flags & OBJF_USERLOADED) && !solib_used (so)) - free_objfile (so->objfile); + so->objfile->unlink (); remove_target_sections (so); clear_so (so); } @@ -1345,21 +1323,20 @@ reload_shared_libraries_1 (int from_tty) && (!was_loaded || filename_cmp (found_pathname, so->so_name) != 0)) { - int got_error = 0; + bool got_error = false; - TRY + try { solib_map_sections (so); } - CATCH (e, RETURN_MASK_ERROR) + catch (const gdb_exception_error &e) { exception_fprintf (gdb_stderr, e, _("Error while mapping " "shared library sections:\n")); - got_error = 1; + got_error = true; } - END_CATCH if (!got_error && (auto_solib_add || was_loaded || libpthread_solib_p (so))) @@ -1369,7 +1346,7 @@ reload_shared_libraries_1 (int from_tty) } static void -reload_shared_libraries (char *ignored, int from_tty, +reload_shared_libraries (const char *ignored, int from_tty, struct cmd_list_element *e) { const struct target_so_ops *ops; @@ -1424,7 +1401,7 @@ reload_shared_libraries (char *ignored, int from_tty, at the start of gdb_sysroot with "target:". */ static void -gdb_sysroot_changed (char *ignored, int from_tty, +gdb_sysroot_changed (const char *ignored, int from_tty, struct cmd_list_element *e) { const char *old_prefix = "remote:"; @@ -1432,7 +1409,7 @@ gdb_sysroot_changed (char *ignored, int from_tty, if (startswith (gdb_sysroot, old_prefix)) { - static int warning_issued = 0; + static bool warning_issued = false; gdb_assert (strlen (old_prefix) == strlen (new_prefix)); memcpy (gdb_sysroot, new_prefix, strlen (new_prefix)); @@ -1443,7 +1420,7 @@ gdb_sysroot_changed (char *ignored, int from_tty, old_prefix, new_prefix); warning (_("sysroot set to \"%s\"."), gdb_sysroot); - warning_issued = 1; + warning_issued = true; } } @@ -1459,21 +1436,6 @@ show_auto_solib_add (struct ui_file *file, int from_tty, } -/* Handler for library-specific lookup of global symbol NAME in OBJFILE. Call - the library-specific handler if it is installed for the current target. */ - -struct block_symbol -solib_global_lookup (struct objfile *objfile, - const char *name, - const domain_enum domain) -{ - const struct target_so_ops *ops = solib_ops (target_gdbarch ()); - - if (ops->lookup_lib_global_symbol != NULL) - return ops->lookup_lib_global_symbol (objfile, name, domain); - return (struct block_symbol) {NULL, NULL}; -} - /* Lookup the value for a specific symbol from dynamic symbol table. Look up symbol from ABFD. MATCH_SYM is a callback function to determine whether to pick up a symbol. DATA is the input of this callback @@ -1492,8 +1454,8 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd, { unsigned int i; - asymbol **symbol_table = (asymbol **) xmalloc (storage_needed); - struct cleanup *back_to = make_cleanup (xfree, symbol_table); + gdb::def_vector storage (storage_needed / sizeof (asymbol *)); + asymbol **symbol_table = storage.data (); unsigned int number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); @@ -1515,9 +1477,8 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd, if (bfd_get_flavour (abfd) == bfd_target_elf_flavour && gdbarch_elf_make_msymbol_special_p (gdbarch)) { - struct minimal_symbol msym; + struct minimal_symbol msym {}; - memset (&msym, 0, sizeof (msym)); SET_MSYMBOL_VALUE_ADDRESS (&msym, symaddr); gdbarch_elf_make_msymbol_special (gdbarch, sym, &msym); symaddr = MSYMBOL_VALUE_RAW_ADDRESS (&msym); @@ -1528,7 +1489,6 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd, break; } } - do_cleanups (back_to); } return symaddr; @@ -1551,8 +1511,8 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd, if (storage_needed > 0) { unsigned int i; - asymbol **symbol_table = (asymbol **) xmalloc (storage_needed); - struct cleanup *back_to = make_cleanup (xfree, symbol_table); + gdb::def_vector storage (storage_needed / sizeof (asymbol *)); + asymbol **symbol_table = storage.data (); unsigned int number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, symbol_table); @@ -1567,7 +1527,6 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd, break; } } - do_cleanups (back_to); } return symaddr; } @@ -1615,7 +1574,7 @@ _initialize_solib (void) { solib_data = gdbarch_data_register_pre_init (solib_init); - observer_attach_free_objfile (remove_user_added_objfile); + gdb::observers::free_objfile.attach (remove_user_added_objfile); add_com ("sharedlibrary", class_files, sharedlibrary_command, _("Load shared object library symbols for files matching REGEXP."));