/* Load module for 'compile' command.
- Copyright (C) 2014-2018 Free Software Foundation, Inc.
+ Copyright (C) 2014-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "arch-utils.h"
#include <algorithm>
-/* 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
/* List of inferior mmap ranges where setup_sections should add its
next range. */
- struct munmap_list **munmap_list_headp;
+ std::unique_ptr<struct munmap_list> munmap_list;
};
/* Place all ABFD sections next to each other obeying all constraints. */
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;
{
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",
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;
if (sect == NULL)
return;
- alignment = ((CORE_ADDR) 1) << bfd_get_section_alignment (abfd, sect);
+ 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;
}
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);
}
{
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. */
{
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);
}
{
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);
}
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. */
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
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<gdb_byte> 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
int nblocks = 0;
int block_loop = 0;
+ lookup_name_info func_matcher (GCC_FE_WRAPPER_FUNCTION,
+ symbol_name_match_type::SEARCH_NAME);
+
bv = SYMTAB_BLOCKVECTOR (func_sym->owner.symtab);
nblocks = BLOCKVECTOR_NBLOCKS (bv);
if (function != NULL
&& (BLOCK_SUPERBLOCK (function_block)
== BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK))
- && (strcmp_iw (SYMBOL_LINKAGE_NAME (function),
- GCC_FE_WRAPPER_FUNCTION)
- == 0))
+ && symbol_matches_search_name (function, func_matcher))
break;
}
if (block_loop == nblocks)
- error (_("No \"%s\" symbol found"), COMPILE_I_EXPR_PTR_TYPE);
+ error (_("No \"%s\" symbol found"), COMPILE_I_EXPR_VAL);
gdb_type = SYMBOL_TYPE (gdb_val_sym);
gdb_type = check_typedef (gdb_type);
error (_("No \"%s\" symbol found"), COMPILE_I_EXPR_PTR_TYPE);
gdb_ptr_type = SYMBOL_TYPE (gdb_ptr_type_sym);
gdb_ptr_type = check_typedef (gdb_ptr_type);
- if (TYPE_CODE (gdb_ptr_type) != TYPE_CODE_PTR)
+ if (gdb_ptr_type->code () != TYPE_CODE_PTR)
error (_("Type of \"%s\" is not a pointer"), COMPILE_I_EXPR_PTR_TYPE);
gdb_type_from_ptr = check_typedef (TYPE_TARGET_TYPE (gdb_ptr_type));
return gdb_type;
}
- if (TYPE_CODE (gdb_type) != TYPE_CODE_PTR)
+ if (gdb_type->code () != TYPE_CODE_PTR)
error (_("Invalid type code %d of symbol \"%s\" "
"in compiled module \"%s\"."),
- TYPE_CODE (gdb_type_from_ptr), COMPILE_I_EXPR_VAL,
+ gdb_type_from_ptr->code (), COMPILE_I_EXPR_VAL,
objfile_name (objfile));
retval = gdb_type_from_ptr;
- switch (TYPE_CODE (gdb_type_from_ptr))
+ switch (gdb_type_from_ptr->code ())
{
case TYPE_CODE_ARRAY:
gdb_type_from_ptr = TYPE_TARGET_TYPE (gdb_type_from_ptr);
default:
error (_("Invalid type code %d of symbol \"%s\" "
"in compiled module \"%s\"."),
- TYPE_CODE (gdb_type_from_ptr), COMPILE_I_EXPR_PTR_TYPE,
+ gdb_type_from_ptr->code (), COMPILE_I_EXPR_PTR_TYPE,
objfile_name (objfile));
}
if (!types_deeply_equal (gdb_type_from_ptr,
return NULL;
regsp_type = check_typedef (TYPE_FIELD_TYPE (func_type, 0));
- if (TYPE_CODE (regsp_type) != TYPE_CODE_PTR)
+ if (regsp_type->code () != TYPE_CODE_PTR)
error (_("Invalid type code %d of first parameter of function \"%s\" "
"in compiled module \"%s\"."),
- TYPE_CODE (regsp_type), GCC_FE_WRAPPER_FUNCTION,
+ regsp_type->code (), GCC_FE_WRAPPER_FUNCTION,
objfile_name (objfile));
regs_type = check_typedef (TYPE_TARGET_TYPE (regsp_type));
- if (TYPE_CODE (regs_type) != TYPE_CODE_STRUCT)
+ if (regs_type->code () != TYPE_CODE_STRUCT)
error (_("Invalid type code %d of dereferenced first parameter "
"of function \"%s\" in compiled module \"%s\"."),
- TYPE_CODE (regs_type), GCC_FE_WRAPPER_FUNCTION,
+ regs_type->code (), GCC_FE_WRAPPER_FUNCTION,
objfile_name (objfile));
return regs_type;
reg_name, pulongest (reg_bitpos), pulongest (reg_bitsize));
reg_offset = reg_bitpos / 8;
- if (TYPE_CODE (reg_type) != TYPE_CODE_INT
- && TYPE_CODE (reg_type) != TYPE_CODE_PTR)
+ if (reg_type->code () != TYPE_CODE_INT
+ && reg_type->code () != TYPE_CODE_PTR)
error (_("Invalid register \"%s\" type code %d"), reg_name,
- TYPE_CODE (reg_type));
+ reg_type->code ());
regnum = compile_register_name_demangle (gdbarch, reg_name);
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;
struct objfile *objfile;
int expect_parameters;
struct type *expect_return_type;
- struct munmap_list *munmap_list_head = NULL;
gdb::unique_xmalloc_ptr<char> filename
(tilde_expand (file_names.object_file ()));
- gdb_bfd_ref_ptr abfd (gdb_bfd_open (filename.get (), gnutarget, -1));
+ gdb_bfd_ref_ptr abfd (gdb_bfd_open (filename.get (), gnutarget));
if (abfd == NULL)
error (_("\"%s\": could not open as compiled module: %s"),
filename.get (), bfd_errmsg (bfd_get_error ()));
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. */
- std::unique_ptr<struct objfile> objfile_holder
- (symbol_file_add_from_bfd (abfd.get (), filename.get (),
- 0, NULL, 0, NULL));
+ 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)
error (_("Cannot find function \"%s\" in compiled module \"%s\"."),
GCC_FE_WRAPPER_FUNCTION, objfile_name (objfile));
func_type = SYMBOL_TYPE (func_sym);
- if (TYPE_CODE (func_type) != TYPE_CODE_FUNC)
+ if (func_type->code () != TYPE_CODE_FUNC)
error (_("Invalid type code %d of function \"%s\" in compiled "
"module \"%s\"."),
- TYPE_CODE (func_type), GCC_FE_WRAPPER_FUNCTION,
+ func_type->code (), GCC_FE_WRAPPER_FUNCTION,
objfile_name (objfile));
switch (scope)
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
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++)
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",
{
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",
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;
}
projects / thirdparty / binutils-gdb.git / blobdiff