diff options
author | Pedro Alves <palves@redhat.com> | 2016-10-26 16:47:10 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-10-26 16:47:10 +0100 |
commit | b15cc25cbe7c13e450f77b4a309223b9b3da3936 (patch) | |
tree | a2f0d2c4f5bb63d6915fbd2516d49a2f61c5620e /gdb/solib.c | |
parent | 85ad3aaf403d2104c82010494d3d4a93a36e2e6f (diff) | |
download | gdb-b15cc25cbe7c13e450f77b4a309223b9b3da3936.zip gdb-b15cc25cbe7c13e450f77b4a309223b9b3da3936.tar.gz gdb-b15cc25cbe7c13e450f77b4a309223b9b3da3936.tar.bz2 |
Make symfile_add_flags and objfile->flags strongly typed
This makes these flag types be "enum flag" types. The benefit is
making use of C++'s stronger typing -- mixing the flags types by
mistake errors at compile time.
This caught one old bug in symbol_file_add_main_1 already, fixed by
this patch as well:
@@ -1318,7 +1326,7 @@ symbol_file_add_main_1 (const char *args, int from_tty, int flags)
what is frameless. */
reinit_frame_cache ();
- if ((flags & SYMFILE_NO_READ) == 0)
+ if ((add_flags & SYMFILE_NO_READ) == 0)
set_initial_language ();
}
Above, "flags" are objfile flags, not symfile_add_flags. So that was
actually checking for "flag & OBJF_PSYMTABS_READ", which has the same
value as SYMFILE_NO_READ...
I moved the flags definitions to separate files to break circular
dependencies.
Built with --enable-targets=all and tested on x86-64 Fedora 23.
gdb/ChangeLog:
2016-10-26 Pedro Alves <palves@redhat.com>
* coffread.c (coff_symfile_read): Use symfile_add_flags.
* dbxread.c (dbx_symfile_read): Ditto.
* elfread.c (elf_symfile_read): Ditto.
* inferior.h: Include symfile-add-flags.h.
(struct inferior) <symfile_flags>: Now symfile_add_flags.
* machoread.c (macho_add_oso_symfile, macho_symfile_read_all_oso)
(macho_symfile_read, mipscoff_symfile_read): Use
symfile_add_flags.
* objfile-flags.h: New file.
* objfiles.c (allocate_objfile): Use objfile_flags.
* objfiles.h: Include objfile-flags.h.
(struct objfile) <flags>: Now an objfile_flags.
(OBJF_REORDERED, OBJF_SHARED, OBJF_READNOW, OBJF_USERLOADED)
(OBJF_PSYMTABS_READ, OBJF_MAINLINE, OBJF_NOT_FILENAME): Delete.
Converted to an enum-flags in objfile-flags.h.
(allocate_objfile): Use objfile_flags.
* python/py-objfile.c (objfpy_add_separate_debug_file): Remove
unnecessary local.
* solib.c (solib_read_symbols, solib_add)
(reload_shared_libraries_1): Use symfile_add_flags.
* solib.h: Include "symfile-add-flags.h".
(solib_read_symbols): Use symfile_add_flags.
* symfile-add-flags.h: New file.
* symfile-debug.c (debug_sym_read): Use symfile_add_flags.
* symfile-mem.c (symbol_file_add_from_memory): Use
symfile_add_flags.
* symfile.c (read_symbols, syms_from_objfile_1)
(syms_from_objfile, finish_new_objfile): Use symfile_add_flags.
(symbol_file_add_with_addrs): Use symfile_add_flags and
objfile_flags.
(symbol_file_add_separate): Use symfile_add_flags.
(symbol_file_add_from_bfd, symbol_file_add): Use symfile_add_flags
and objfile_flags.
(symbol_file_add_main_1): : Use objfile_flags. Fix add_flags vs
flags confusion.
(symbol_file_command): Use objfile_flags.
(add_symbol_file_command): Use symfile_add_flags and
objfile_flags.
(clear_symtab_users): Use symfile_add_flags.
* symfile.h: Include "symfile-add-flags.h" and "objfile-flags.h".
(struct sym_fns) <sym_read>: Use symfile_add_flags.
(clear_symtab_users): Use symfile_add_flags.
(enum symfile_add_flags): Delete, moved to symfile-add-flags.h and
converted to enum-flags.
(symbol_file_add, symbol_file_add_from_bfd)
(symbol_file_add_separate): Use symfile_add_flags.
* xcoffread.c (xcoff_initial_scan): Use symfile_add_flags.
Diffstat (limited to 'gdb/solib.c')
-rw-r--r-- | gdb/solib.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gdb/solib.c b/gdb/solib.c index b8c2b42..5067191 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -669,7 +669,7 @@ master_so_list (void) loaded. */ int -solib_read_symbols (struct so_list *so, int flags) +solib_read_symbols (struct so_list *so, symfile_add_flags flags) { if (so->symbols_loaded) { @@ -999,8 +999,10 @@ solib_add (const char *pattern, int from_tty, { int any_matches = 0; int loaded_any_symbols = 0; - const int flags = - SYMFILE_DEFER_BP_RESET | (from_tty ? SYMFILE_VERBOSE : 0); + symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET; + + if (from_tty) + add_flags |= SYMFILE_VERBOSE; for (gdb = so_list_head; gdb; gdb = gdb->next) if (! pattern || re_exec (gdb->so_name)) @@ -1024,7 +1026,7 @@ solib_add (const char *pattern, int from_tty, printf_unfiltered (_("Symbols already loaded for %s\n"), gdb->so_name); } - else if (solib_read_symbols (gdb, flags)) + else if (solib_read_symbols (gdb, add_flags)) loaded_any_symbols = 1; } } @@ -1357,8 +1359,10 @@ reload_shared_libraries_1 (int from_tty) char *filename, *found_pathname = NULL; bfd *abfd; int was_loaded = so->symbols_loaded; - const int flags = - SYMFILE_DEFER_BP_RESET | (from_tty ? SYMFILE_VERBOSE : 0); + symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET; + + if (from_tty) + add_flags |= SYMFILE_VERBOSE; filename = tilde_expand (so->so_original_name); make_cleanup (xfree, filename); @@ -1407,7 +1411,7 @@ reload_shared_libraries_1 (int from_tty) if (!got_error && (auto_solib_add || was_loaded || libpthread_solib_p (so))) - solib_read_symbols (so, flags); + solib_read_symbols (so, add_flags); } } |