X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcompile%2Fcompile-object-load.c;h=c8762ad6595a956cf5b34c7bc5bb19c1507d272a;hb=268e4f09144c48e02f01d82ab3aab359457df214;hp=4392c150316503d4310e10577b1dc1e65ecb8b0b;hpb=1a72702bb30ec3f94627cfcae684823b413f20b9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c index 4392c15031..c8762ad659 100644 --- a/gdb/compile/compile-object-load.c +++ b/gdb/compile/compile-object-load.c @@ -1,6 +1,6 @@ /* Load module for 'compile' command. - Copyright (C) 2014-2016 Free Software Foundation, Inc. + Copyright (C) 2014-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -28,62 +28,40 @@ #include "gdbcmd.h" #include "regcache.h" #include "inferior.h" +#include "gdbthread.h" #include "compile.h" #include "block.h" #include "arch-utils.h" +#include -/* Track inferior memory reserved by inferior mmap. */ +/* Add inferior mmap memory range ADDR..ADDR+SIZE (exclusive) to the + list. */ -struct munmap_list -{ - struct munmap_list *next; - CORE_ADDR addr, size; -}; - -/* Add inferior mmap memory range ADDR..ADDR+SIZE (exclusive) to list - HEADP. *HEADP needs to be initialized to NULL. */ - -static void -munmap_list_add (struct munmap_list **headp, CORE_ADDR addr, CORE_ADDR size) +void +munmap_list::add (CORE_ADDR addr, CORE_ADDR size) { - struct munmap_list *head_new = XNEW (struct munmap_list); - - head_new->next = *headp; - *headp = head_new; - head_new->addr = addr; - head_new->size = size; + struct munmap_item item = { addr, size }; + items.push_back (item); } -/* Free list of inferior mmap memory ranges HEAD. HEAD is the first - element of the list, it can be NULL. After calling this function - HEAD pointer is invalid and the possible list needs to be - reinitialized by caller to NULL. */ +/* Destroy an munmap_list. */ -void -munmap_list_free (struct munmap_list *head) +munmap_list::~munmap_list () { - while (head) + for (auto &item : items) { - struct munmap_list *todo = head; - - head = todo->next; - gdbarch_infcall_munmap (target_gdbarch (), todo->addr, todo->size); - xfree (todo); + try + { + gdbarch_infcall_munmap (target_gdbarch (), item.addr, item.size); + } + catch (const gdb_exception_error &ex) + { + /* There's not much the user can do, so just ignore + this. */ + } } } -/* Stub for munmap_list_free suitable for make_cleanup. Contrary to - munmap_list_free this function's parameter is a pointer to the first - list element pointer. */ - -static void -munmap_listp_free_cleanup (void *headp_voidp) -{ - struct munmap_list **headp = (struct munmap_list **) headp_voidp; - - munmap_list_free (*headp); -} - /* Helper data for setup_sections. */ struct setup_sections_data @@ -103,7 +81,7 @@ struct setup_sections_data /* List of inferior mmap ranges where setup_sections should add its next range. */ - struct munmap_list **munmap_list_headp; + std::unique_ptr munmap_list; }; /* Place all ABFD sections next to each other obeying all constraints. */ @@ -121,30 +99,30 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp) if (sect->output_section == NULL) sect->output_section = sect; - if ((bfd_get_section_flags (abfd, sect) & SEC_ALLOC) == 0) + if ((bfd_section_flags (sect) & SEC_ALLOC) == 0) return; /* Make the memory always readable. */ prot = GDB_MMAP_PROT_READ; - if ((bfd_get_section_flags (abfd, sect) & SEC_READONLY) == 0) + if ((bfd_section_flags (sect) & SEC_READONLY) == 0) prot |= GDB_MMAP_PROT_WRITE; - if ((bfd_get_section_flags (abfd, sect) & SEC_CODE) != 0) + if ((bfd_section_flags (sect) & SEC_CODE) != 0) prot |= GDB_MMAP_PROT_EXEC; if (compile_debug) fprintf_unfiltered (gdb_stdlog, "module \"%s\" section \"%s\" size %s prot %u\n", bfd_get_filename (abfd), - bfd_get_section_name (abfd, sect), + bfd_section_name (sect), paddress (target_gdbarch (), - bfd_get_section_size (sect)), + bfd_section_size (sect)), prot); } else prot = -1; if (sect == NULL - || (data->last_prot != prot && bfd_get_section_size (sect) != 0)) + || (data->last_prot != prot && bfd_section_size (sect) != 0)) { CORE_ADDR addr; asection *sect_iter; @@ -153,7 +131,7 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp) { addr = gdbarch_infcall_mmap (target_gdbarch (), data->last_size, data->last_prot); - munmap_list_add (data->munmap_list_headp, addr, data->last_size); + data->munmap_list->add (addr, data->last_size); if (compile_debug) fprintf_unfiltered (gdb_stdlog, "allocated %s bytes at %s prot %u\n", @@ -172,9 +150,8 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp) for (sect_iter = data->last_section_first; sect_iter != sect; sect_iter = sect_iter->next) - if ((bfd_get_section_flags (abfd, sect_iter) & SEC_ALLOC) != 0) - bfd_set_section_vma (abfd, sect_iter, - addr + bfd_get_section_vma (abfd, sect_iter)); + if ((bfd_section_flags (sect_iter) & SEC_ALLOC) != 0) + bfd_set_section_vma (sect_iter, addr + bfd_section_vma (sect_iter)); data->last_size = 0; data->last_section_first = sect; @@ -185,14 +162,14 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp) if (sect == NULL) return; - alignment = ((CORE_ADDR) 1) << bfd_get_section_alignment (abfd, sect); - data->last_max_alignment = max (data->last_max_alignment, alignment); + alignment = ((CORE_ADDR) 1) << bfd_section_alignment (sect); + data->last_max_alignment = std::max (data->last_max_alignment, alignment); data->last_size = (data->last_size + alignment - 1) & -alignment; - bfd_set_section_vma (abfd, sect, data->last_size); + bfd_set_section_vma (sect, data->last_size); - data->last_size += bfd_get_section_size (sect); + data->last_size += bfd_section_size (sect); data->last_size = (data->last_size + alignment - 1) & -alignment; } @@ -219,7 +196,7 @@ link_callbacks_warning (struct bfd_link_info *link_info, const char *xwarning, bfd_vma address) { warning (_("Compiled module \"%s\" section \"%s\": warning: %s"), - bfd_get_filename (abfd), bfd_get_section_name (abfd, section), + bfd_get_filename (abfd), bfd_section_name (section), xwarning); } @@ -232,7 +209,7 @@ link_callbacks_undefined_symbol (struct bfd_link_info *link_info, { warning (_("Cannot resolve relocation to \"%s\" " "from compiled module \"%s\" section \"%s\"."), - name, bfd_get_filename (abfd), bfd_get_section_name (abfd, section)); + name, bfd_get_filename (abfd), bfd_section_name (section)); } /* Helper for link_callbacks callbacks vector. */ @@ -255,7 +232,7 @@ link_callbacks_reloc_dangerous (struct bfd_link_info *link_info, { warning (_("Compiled module \"%s\" section \"%s\": dangerous " "relocation: %s\n"), - bfd_get_filename (abfd), bfd_get_section_name (abfd, section), + bfd_get_filename (abfd), bfd_section_name (section), message); } @@ -268,7 +245,7 @@ link_callbacks_unattached_reloc (struct bfd_link_info *link_info, { warning (_("Compiled module \"%s\" section \"%s\": unattached " "relocation: %s\n"), - bfd_get_filename (abfd), bfd_get_section_name (abfd, section), + bfd_get_filename (abfd), bfd_section_name (section), name); } @@ -280,18 +257,13 @@ static void link_callbacks_einfo (const char *fmt, ...) static void link_callbacks_einfo (const char *fmt, ...) { - struct cleanup *cleanups; va_list ap; - char *str; va_start (ap, fmt); - str = xstrvprintf (fmt, ap); + std::string str = string_vprintf (fmt, ap); va_end (ap); - cleanups = make_cleanup (xfree, str); - - warning (_("Compile module: warning: %s"), str); - do_cleanups (cleanups); + warning (_("Compile module: warning: %s"), str.c_str ()); } /* Helper for bfd_get_relocated_section_contents. @@ -319,22 +291,26 @@ static const struct bfd_link_callbacks link_callbacks = struct link_hash_table_cleanup_data { - bfd *abfd; - bfd *link_next; -}; + explicit link_hash_table_cleanup_data (bfd *abfd_) + : abfd (abfd_), + link_next (abfd->link.next) + { + } -/* Cleanup callback for struct bfd_link_info. */ + ~link_hash_table_cleanup_data () + { + if (abfd->is_linker_output) + (*abfd->link.hash->hash_table_free) (abfd); + abfd->link.next = link_next; + } -static void -link_hash_table_free (void *d) -{ - struct link_hash_table_cleanup_data *data - = (struct link_hash_table_cleanup_data *) d; + DISABLE_COPY_AND_ASSIGN (link_hash_table_cleanup_data); - if (data->abfd->is_linker_output) - (*data->abfd->link.hash->hash_table_free) (data->abfd); - data->abfd->link.next = data->link_next; -} +private: + + bfd *abfd; + bfd *link_next; +}; /* Relocate and store into inferior memory each section SECT of ABFD. */ @@ -342,18 +318,16 @@ static void copy_sections (bfd *abfd, asection *sect, void *data) { asymbol **symbol_table = (asymbol **) data; - bfd_byte *sect_data, *sect_data_got; - struct cleanup *cleanups; + bfd_byte *sect_data_got; struct bfd_link_info link_info; struct bfd_link_order link_order; CORE_ADDR inferior_addr; - struct link_hash_table_cleanup_data cleanup_data; - if ((bfd_get_section_flags (abfd, sect) & (SEC_ALLOC | SEC_LOAD)) + if ((bfd_section_flags (sect) & (SEC_ALLOC | SEC_LOAD)) != (SEC_ALLOC | SEC_LOAD)) return; - if (bfd_get_section_size (sect) == 0) + if (bfd_section_size (sect) == 0) return; /* Mostly a copy of bfd_simple_get_relocated_section_contents which GDB @@ -363,46 +337,43 @@ copy_sections (bfd *abfd, asection *sect, void *data) link_info.input_bfds = abfd; link_info.input_bfds_tail = &abfd->link.next; - cleanup_data.abfd = abfd; - cleanup_data.link_next = abfd->link.next; + struct link_hash_table_cleanup_data cleanup_data (abfd); abfd->link.next = NULL; link_info.hash = bfd_link_hash_table_create (abfd); - cleanups = make_cleanup (link_hash_table_free, &cleanup_data); link_info.callbacks = &link_callbacks; memset (&link_order, 0, sizeof (link_order)); link_order.next = NULL; link_order.type = bfd_indirect_link_order; link_order.offset = 0; - link_order.size = bfd_get_section_size (sect); + link_order.size = bfd_section_size (sect); link_order.u.indirect.section = sect; - sect_data = (bfd_byte *) xmalloc (bfd_get_section_size (sect)); - make_cleanup (xfree, sect_data); + gdb::unique_xmalloc_ptr sect_data + ((bfd_byte *) xmalloc (bfd_section_size (sect))); sect_data_got = bfd_get_relocated_section_contents (abfd, &link_info, - &link_order, sect_data, + &link_order, + sect_data.get (), FALSE, symbol_table); if (sect_data_got == NULL) error (_("Cannot map compiled module \"%s\" section \"%s\": %s"), - bfd_get_filename (abfd), bfd_get_section_name (abfd, sect), + bfd_get_filename (abfd), bfd_section_name (sect), bfd_errmsg (bfd_get_error ())); - gdb_assert (sect_data_got == sect_data); + gdb_assert (sect_data_got == sect_data.get ()); - inferior_addr = bfd_get_section_vma (abfd, sect); - if (0 != target_write_memory (inferior_addr, sect_data, - bfd_get_section_size (sect))) + inferior_addr = bfd_section_vma (sect); + if (0 != target_write_memory (inferior_addr, sect_data.get (), + bfd_section_size (sect))) error (_("Cannot write compiled module \"%s\" section \"%s\" " "to inferior memory range %s-%s."), - bfd_get_filename (abfd), bfd_get_section_name (abfd, sect), + bfd_get_filename (abfd), bfd_section_name (sect), paddress (target_gdbarch (), inferior_addr), paddress (target_gdbarch (), - inferior_addr + bfd_get_section_size (sect))); - - do_cleanups (cleanups); + inferior_addr + bfd_section_size (sect))); } /* Fetch the type of COMPILE_I_EXPR_PTR_TYPE and COMPILE_I_EXPR_VAL @@ -443,7 +414,10 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile, block = BLOCKVECTOR_BLOCK (bv, block_loop); if (BLOCK_FUNCTION (block) != NULL) continue; - gdb_val_sym = block_lookup_symbol (block, COMPILE_I_EXPR_VAL, VAR_DOMAIN); + gdb_val_sym = block_lookup_symbol (block, + COMPILE_I_EXPR_VAL, + symbol_name_match_type::SEARCH_NAME, + VAR_DOMAIN); if (gdb_val_sym == NULL) continue; @@ -459,7 +433,8 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile, if (function != NULL && (BLOCK_SUPERBLOCK (function_block) == BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK)) - && (strcmp (SYMBOL_LINKAGE_NAME (function), GCC_FE_WRAPPER_FUNCTION) + && (strcmp_iw (function->linkage_name (), + GCC_FE_WRAPPER_FUNCTION) == 0)) break; } @@ -470,6 +445,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile, gdb_type = check_typedef (gdb_type); gdb_ptr_type_sym = block_lookup_symbol (block, COMPILE_I_EXPR_PTR_TYPE, + symbol_name_match_type::SEARCH_NAME, VAR_DOMAIN); if (gdb_ptr_type_sym == NULL) error (_("No \"%s\" symbol found"), COMPILE_I_EXPR_PTR_TYPE); @@ -477,7 +453,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile, gdb_ptr_type = check_typedef (gdb_ptr_type); if (TYPE_CODE (gdb_ptr_type) != TYPE_CODE_PTR) error (_("Type of \"%s\" is not a pointer"), COMPILE_I_EXPR_PTR_TYPE); - gdb_type_from_ptr = TYPE_TARGET_TYPE (gdb_ptr_type); + gdb_type_from_ptr = check_typedef (TYPE_TARGET_TYPE (gdb_ptr_type)); if (types_deeply_equal (gdb_type, gdb_type_from_ptr)) { @@ -555,7 +531,6 @@ static void store_regs (struct type *regs_type, CORE_ADDR regs_base) { struct gdbarch *gdbarch = target_gdbarch (); - struct regcache *regcache = get_thread_regcache (inferior_ptid); int fieldno; for (fieldno = 0; fieldno < TYPE_NFIELDS (regs_type); fieldno++) @@ -600,74 +575,70 @@ store_regs (struct type *regs_type, CORE_ADDR regs_base) } } -/* Load OBJECT_FILE into inferior memory. Throw an error otherwise. - Caller must fully dispose the return value by calling compile_object_run. - SOURCE_FILE's copy is stored into the returned object. - Caller should free both OBJECT_FILE and SOURCE_FILE immediatelly after this - function returns. - Function returns NULL only for COMPILE_I_PRINT_ADDRESS_SCOPE when - COMPILE_I_PRINT_VALUE_SCOPE should have been used instead. */ +/* Load the object file specified in FILE_NAMES into inferior memory. + Throw an error otherwise. Caller must fully dispose the return + value by calling compile_object_run. Returns NULL only for + COMPILE_I_PRINT_ADDRESS_SCOPE when COMPILE_I_PRINT_VALUE_SCOPE + should have been used instead. */ struct compile_module * -compile_object_load (const char *object_file, const char *source_file, +compile_object_load (const compile_file_names &file_names, enum compile_i_scope_types scope, void *scope_data) { - struct cleanup *cleanups, *cleanups_free_objfile; - bfd *abfd; struct setup_sections_data setup_sections_data; - CORE_ADDR addr, regs_addr, out_value_addr = 0; + CORE_ADDR regs_addr, out_value_addr = 0; struct symbol *func_sym; struct type *func_type; struct bound_minimal_symbol bmsym; long storage_needed; asymbol **symbol_table, **symp; long number_of_symbols, missing_symbols; - struct type *dptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr; - unsigned dptr_type_len = TYPE_LENGTH (dptr_type); struct compile_module *retval; struct type *regs_type, *out_value_type = NULL; - char *filename, **matching; + char **matching; struct objfile *objfile; int expect_parameters; struct type *expect_return_type; - struct munmap_list *munmap_list_head = NULL; - filename = tilde_expand (object_file); - cleanups = make_cleanup (xfree, filename); + gdb::unique_xmalloc_ptr filename + (tilde_expand (file_names.object_file ())); - abfd = gdb_bfd_open (filename, gnutarget, -1); + gdb_bfd_ref_ptr abfd (gdb_bfd_open (filename.get (), gnutarget, -1)); if (abfd == NULL) error (_("\"%s\": could not open as compiled module: %s"), - filename, bfd_errmsg (bfd_get_error ())); - make_cleanup_bfd_unref (abfd); + filename.get (), bfd_errmsg (bfd_get_error ())); - if (!bfd_check_format_matches (abfd, bfd_object, &matching)) + if (!bfd_check_format_matches (abfd.get (), bfd_object, &matching)) error (_("\"%s\": not in loadable format: %s"), - filename, gdb_bfd_errmsg (bfd_get_error (), matching)); + filename.get (), + gdb_bfd_errmsg (bfd_get_error (), matching).c_str ()); - if ((bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC)) != 0) - error (_("\"%s\": not in object format."), filename); + if ((bfd_get_file_flags (abfd.get ()) & (EXEC_P | DYNAMIC)) != 0) + error (_("\"%s\": not in object format."), filename.get ()); setup_sections_data.last_size = 0; setup_sections_data.last_section_first = abfd->sections; setup_sections_data.last_prot = -1; setup_sections_data.last_max_alignment = 1; - setup_sections_data.munmap_list_headp = &munmap_list_head; - make_cleanup (munmap_listp_free_cleanup, &munmap_list_head); - bfd_map_over_sections (abfd, setup_sections, &setup_sections_data); - setup_sections (abfd, NULL, &setup_sections_data); + setup_sections_data.munmap_list.reset (new struct munmap_list); + + bfd_map_over_sections (abfd.get (), setup_sections, &setup_sections_data); + setup_sections (abfd.get (), NULL, &setup_sections_data); - storage_needed = bfd_get_symtab_upper_bound (abfd); + storage_needed = bfd_get_symtab_upper_bound (abfd.get ()); if (storage_needed < 0) error (_("Cannot read symbols of compiled module \"%s\": %s"), - filename, bfd_errmsg (bfd_get_error ())); + filename.get (), bfd_errmsg (bfd_get_error ())); /* SYMFILE_VERBOSE is not passed even if FROM_TTY, user is not interested in "Reading symbols from ..." message for automatically generated file. */ - objfile = symbol_file_add_from_bfd (abfd, filename, 0, NULL, 0, NULL); - cleanups_free_objfile = make_cleanup_free_objfile (objfile); + objfile_up objfile_holder (symbol_file_add_from_bfd (abfd.get (), + filename.get (), + 0, NULL, 0, NULL)); + objfile = objfile_holder.get (); func_sym = lookup_global_symbol_from_objfile (objfile, + GLOBAL_BLOCK, GCC_FE_WRAPPER_FUNCTION, VAR_DOMAIN).symbol; if (func_sym == NULL) @@ -705,18 +676,18 @@ compile_object_load (const char *object_file, const char *source_file, objfile_name (objfile)); if (!types_deeply_equal (expect_return_type, TYPE_TARGET_TYPE (func_type))) error (_("Invalid return type of function \"%s\" in compiled " - "module \"%s\"."), - GCC_FE_WRAPPER_FUNCTION, objfile_name (objfile)); + "module \"%s\"."), + GCC_FE_WRAPPER_FUNCTION, objfile_name (objfile)); /* The memory may be later needed by bfd_generic_get_relocated_section_contents called from default_symfile_relocate. */ symbol_table = (asymbol **) obstack_alloc (&objfile->objfile_obstack, storage_needed); - number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); + number_of_symbols = bfd_canonicalize_symtab (abfd.get (), symbol_table); if (number_of_symbols < 0) error (_("Cannot parse symbols of compiled module \"%s\": %s"), - filename, bfd_errmsg (bfd_get_error ())); + filename.get (), bfd_errmsg (bfd_get_error ())); missing_symbols = 0; for (symp = symbol_table; symp < symbol_table + number_of_symbols; symp++) @@ -745,6 +716,8 @@ compile_object_load (const char *object_file, const char *source_file, ? mst_unknown : MSYMBOL_TYPE (bmsym.minsym)) { case mst_text: + case mst_bss: + case mst_data: sym->value = BMSYMBOL_VALUE_ADDRESS (bmsym); if (compile_debug) fprintf_unfiltered (gdb_stdlog, @@ -765,14 +738,14 @@ compile_object_load (const char *object_file, const char *source_file, default: warning (_("Could not find symbol \"%s\" " "for compiled module \"%s\"."), - sym->name, filename); + sym->name, filename.get ()); missing_symbols++; } } if (missing_symbols) error (_("%ld symbols were missing, cannot continue."), missing_symbols); - bfd_map_over_sections (abfd, copy_sections, symbol_table); + bfd_map_over_sections (abfd.get (), copy_sections, symbol_table); regs_type = get_regs_type (func_sym, objfile); if (regs_type == NULL) @@ -784,7 +757,7 @@ compile_object_load (const char *object_file, const char *source_file, TYPE_LENGTH (regs_type), GDB_MMAP_PROT_READ); gdb_assert (regs_addr != 0); - munmap_list_add (&munmap_list_head, regs_addr, TYPE_LENGTH (regs_type)); + setup_sections_data.munmap_list->add (regs_addr, TYPE_LENGTH (regs_type)); if (compile_debug) fprintf_unfiltered (gdb_stdlog, "allocated %s bytes at %s for registers\n", @@ -799,18 +772,15 @@ compile_object_load (const char *object_file, const char *source_file, { out_value_type = get_out_value_type (func_sym, objfile, scope); if (out_value_type == NULL) - { - do_cleanups (cleanups); - return NULL; - } + return NULL; check_typedef (out_value_type); out_value_addr = gdbarch_infcall_mmap (target_gdbarch (), TYPE_LENGTH (out_value_type), (GDB_MMAP_PROT_READ | GDB_MMAP_PROT_WRITE)); gdb_assert (out_value_addr != 0); - munmap_list_add (&munmap_list_head, out_value_addr, - TYPE_LENGTH (out_value_type)); + setup_sections_data.munmap_list->add (out_value_addr, + TYPE_LENGTH (out_value_type)); if (compile_debug) fprintf_unfiltered (gdb_stdlog, "allocated %s bytes at %s for printed value\n", @@ -819,23 +789,16 @@ compile_object_load (const char *object_file, const char *source_file, paddress (target_gdbarch (), out_value_addr)); } - discard_cleanups (cleanups_free_objfile); - retval = XNEW (struct compile_module); - retval->objfile = objfile; - retval->source_file = xstrdup (source_file); + retval->objfile = objfile_holder.release (); + retval->source_file = xstrdup (file_names.source_file ()); retval->func_sym = func_sym; retval->regs_addr = regs_addr; retval->scope = scope; retval->scope_data = scope_data; retval->out_value_type = out_value_type; retval->out_value_addr = out_value_addr; - - /* CLEANUPS will free MUNMAP_LIST_HEAD. */ - retval->munmap_list_head = munmap_list_head; - munmap_list_head = NULL; - - do_cleanups (cleanups); + retval->munmap_list_head = setup_sections_data.munmap_list.release (); return retval; }