X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcompile%2Fcompile-object-load.c;h=4e702051950c6e431a84eb46f2f2ad213070160a;hb=230d2906b9d1d009b22fd526181bf43e1084ed59;hp=f1c8ccd4d09c42e3b89d21f43f1732f53ae8a332;hpb=798a7429f980a00844c22dfdda9475c451c635d4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c index f1c8ccd4d0..4e70205195 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-2017 Free Software Foundation, Inc. + Copyright (C) 2014-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -28,63 +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 @@ -104,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. */ @@ -154,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", @@ -315,22 +292,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. */ @@ -338,12 +319,10 @@ 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)) != (SEC_ALLOC | SEC_LOAD)) @@ -359,13 +338,11 @@ 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)); @@ -375,21 +352,22 @@ copy_sections (bfd *abfd, asection *sect, void *data) link_order.size = bfd_get_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_get_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_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, + if (0 != target_write_memory (inferior_addr, sect_data.get (), bfd_get_section_size (sect))) error (_("Cannot write compiled module \"%s\" section \"%s\" " "to inferior memory range %s-%s."), @@ -397,8 +375,6 @@ copy_sections (bfd *abfd, asection *sect, void *data) paddress (target_gdbarch (), inferior_addr), paddress (target_gdbarch (), inferior_addr + bfd_get_section_size (sect))); - - do_cleanups (cleanups); } /* Fetch the type of COMPILE_I_EXPR_PTR_TYPE and COMPILE_I_EXPR_VAL @@ -439,7 +415,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; @@ -455,7 +434,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 (SYMBOL_LINKAGE_NAME (function), + GCC_FE_WRAPPER_FUNCTION) == 0)) break; } @@ -466,6 +446,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); @@ -473,7 +454,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)) { @@ -551,7 +532,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++) @@ -606,7 +586,6 @@ struct compile_module * compile_object_load (const compile_file_names &file_names, enum compile_i_scope_types scope, void *scope_data) { - struct cleanup *cleanups; struct setup_sections_data setup_sections_data; CORE_ADDR regs_addr, out_value_addr = 0; struct symbol *func_sym; @@ -621,7 +600,6 @@ compile_object_load (const compile_file_names &file_names, struct objfile *objfile; int expect_parameters; struct type *expect_return_type; - struct munmap_list *munmap_list_head = NULL; gdb::unique_xmalloc_ptr filename (tilde_expand (file_names.object_file ())); @@ -633,7 +611,8 @@ compile_object_load (const compile_file_names &file_names, if (!bfd_check_format_matches (abfd.get (), bfd_object, &matching)) error (_("\"%s\": not in loadable format: %s"), - filename.get (), gdb_bfd_errmsg (bfd_get_error (), matching)); + filename.get (), + gdb_bfd_errmsg (bfd_get_error (), matching).c_str ()); if ((bfd_get_file_flags (abfd.get ()) & (EXEC_P | DYNAMIC)) != 0) error (_("\"%s\": not in object format."), filename.get ()); @@ -642,15 +621,15 @@ compile_object_load (const compile_file_names &file_names, 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; - cleanups = make_cleanup (munmap_listp_free_cleanup, &munmap_list_head); + 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.get ()); if (storage_needed < 0) error (_("Cannot read symbols of compiled module \"%s\": %s"), - filename.get (), 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. */ @@ -697,8 +676,8 @@ compile_object_load (const compile_file_names &file_names, 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 @@ -708,7 +687,7 @@ compile_object_load (const compile_file_names &file_names, 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.get (), 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++) @@ -737,6 +716,8 @@ compile_object_load (const compile_file_names &file_names, ? 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, @@ -776,7 +757,7 @@ compile_object_load (const compile_file_names &file_names, 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", @@ -791,18 +772,15 @@ compile_object_load (const compile_file_names &file_names, { 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", @@ -820,12 +798,7 @@ compile_object_load (const compile_file_names &file_names, 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; }