/* Load module for 'compile' command.
- Copyright (C) 2014-2018 Free Software Foundation, Inc.
+ Copyright (C) 2014-2019 Free Software Foundation, Inc.
This file is part of GDB.
munmap_list::~munmap_list ()
{
for (auto &item : items)
- gdbarch_infcall_munmap (target_gdbarch (), item.addr, item.size);
+ {
+ 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. */
+ }
+ }
}
/* Helper data for setup_sections. */
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;
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
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)
projects / deliverable / binutils-gdb.git / blobdiff