FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify compile_module cleanup

Browse source 
This simplifies compile_module cleanup by removing the need to
explicitly free anything.  struct setup_sections_data is also cleaned
up a bit.

gdb/ChangeLog
2020-09-23  Tom Tromey  <tom@tromey.com>

	* compile/compile-object-run.c (do_module_cleanup)
	<~do_module_cleanup> :Remove.
	(do_module_cleanup): Update.
	* compile/compile-object-load.h (struct munmap_list): Add move
	assignment operator.
	<source_file>: Now a std::string.
	<munmap_list>: Rename.  No longer a pointer.
	* compile/compile-object-load.c (struct setup_sections_data): Add
	constructor.
	<setup_one_section>: Declare.
	<munmap_list>: Move earlier.
	<m_bfd>: New member.
	<m_last_size, m_last_section_first, m_last_prot,
	m_last_max_alignment>: Rename, add initializers where needed.
	(setup_sections_data::setup_one_section): Rename from
	setup_sections.  Update.
	(compile_object_load): Update.  Don't use bfd_map_over_sections.
This commit is contained in:
Tom Tromey 2020-09-23 09:32:54 -06:00
parent e616f60a6b
commit 92677124d9
4 changed files with 88 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gdb/ChangeLog
View file

@ -1,3 +1,23 @@
2020-09-23 Tom Tromey <tom@tromey.com>
* compile/compile-object-run.c (do_module_cleanup)
<~do_module_cleanup> :Remove.
(do_module_cleanup): Update.
* compile/compile-object-load.h (struct munmap_list): Add move
assignment operator.
<source_file>: Now a std::string.
<munmap_list>: Rename. No longer a pointer.
* compile/compile-object-load.c (struct setup_sections_data): Add
constructor.
<setup_one_section>: Declare.
<munmap_list>: Move earlier.
<m_bfd>: New member.
<m_last_size, m_last_section_first, m_last_prot,
m_last_max_alignment>: Rename, add initializers where needed.
(setup_sections_data::setup_one_section): Rename from
setup_sections. Update.
(compile_object_load): Update. Don't use bfd_map_over_sections.
2020-09-23 Tom Tromey <tom@tromey.com> 2020-09-23 Tom Tromey <tom@tromey.com>
* compile/compile-object-run.c (struct do_module_cleanup): Add * compile/compile-object-run.c (struct do_module_cleanup): Add

111
gdb/compile/compile-object-load.c
View file

@ -62,34 +62,50 @@ munmap_list::~munmap_list ()
} }
} }
/* Helper data for setup_sections. */ /* A data structure that is used to lay out sections of our objfile in
inferior memory. */
struct setup_sections_data struct setup_sections_data
{ {
/* Size of all recent sections with matching LAST_PROT. */ explicit setup_sections_data (bfd *abfd)
CORE_ADDR last_size; : m_bfd (abfd),
m_last_section_first (abfd->sections)
{
}
/* First section matching LAST_PROT. */ /* Place all ABFD sections next to each other obeying all
asection *last_section_first; constraints. */
void setup_one_section (asection *sect);
/* Memory protection like the prot parameter of gdbarch_infcall_mmap. */
unsigned last_prot;
/* Maximum of alignments of all sections matching LAST_PROT.
This value is always at least 1. This value is always a power of 2. */
CORE_ADDR last_max_alignment;
/* List of inferior mmap ranges where setup_sections should add its /* List of inferior mmap ranges where setup_sections should add its
next range. */ next range. */
std::unique_ptr<struct munmap_list> munmap_list; struct munmap_list munmap_list;
private:
/* The BFD. */
bfd *m_bfd;
/* Size of all recent sections with matching LAST_PROT. */
CORE_ADDR m_last_size = 0;
/* First section matching LAST_PROT. */
asection *m_last_section_first;
/* Memory protection like the prot parameter of gdbarch_infcall_mmap. */
unsigned m_last_prot = -1;
/* Maximum of alignments of all sections matching LAST_PROT.
This value is always at least 1. This value is always a power of 2. */
CORE_ADDR m_last_max_alignment = -1;
}; };
/* Place all ABFD sections next to each other obeying all constraints. */ /* See setup_sections_data. */
static void void
setup_sections (bfd *abfd, asection *sect, void *data_voidp) setup_sections_data::setup_one_section (asection *sect)
{ {
struct setup_sections_data *data = (struct setup_sections_data *) data_voidp;
CORE_ADDR alignment; CORE_ADDR alignment;
unsigned prot; unsigned prot;
@ -112,7 +128,7 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp)
if (compile_debug) if (compile_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"module \"%s\" section \"%s\" size %s prot %u\n", "module \"%s\" section \"%s\" size %s prot %u\n",
bfd_get_filename (abfd), bfd_get_filename (m_bfd),
bfd_section_name (sect), bfd_section_name (sect),
paddress (target_gdbarch (), paddress (target_gdbarch (),
bfd_section_size (sect)), bfd_section_size (sect)),
@ -122,55 +138,55 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp)
prot = -1; prot = -1;
if (sect == NULL if (sect == NULL
|| (data->last_prot != prot && bfd_section_size (sect) != 0)) || (m_last_prot != prot && bfd_section_size (sect) != 0))
{ {
CORE_ADDR addr; CORE_ADDR addr;
asection *sect_iter; asection *sect_iter;
if (data->last_size != 0) if (m_last_size != 0)
{ {
addr = gdbarch_infcall_mmap (target_gdbarch (), data->last_size, addr = gdbarch_infcall_mmap (target_gdbarch (), m_last_size,
data->last_prot); m_last_prot);
data->munmap_list->add (addr, data->last_size); munmap_list.add (addr, m_last_size);
if (compile_debug) if (compile_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"allocated %s bytes at %s prot %u\n", "allocated %s bytes at %s prot %u\n",
paddress (target_gdbarch (), data->last_size), paddress (target_gdbarch (), m_last_size),
paddress (target_gdbarch (), addr), paddress (target_gdbarch (), addr),
data->last_prot); m_last_prot);
} }
else else
addr = 0; addr = 0;
if ((addr & (data->last_max_alignment - 1)) != 0) if ((addr & (m_last_max_alignment - 1)) != 0)
error (_("Inferior compiled module address %s " error (_("Inferior compiled module address %s "
"is not aligned to BFD required %s."), "is not aligned to BFD required %s."),
paddress (target_gdbarch (), addr), paddress (target_gdbarch (), addr),
paddress (target_gdbarch (), data->last_max_alignment)); paddress (target_gdbarch (), m_last_max_alignment));
for (sect_iter = data->last_section_first; sect_iter != sect; for (sect_iter = m_last_section_first; sect_iter != sect;
sect_iter = sect_iter->next) sect_iter = sect_iter->next)
if ((bfd_section_flags (sect_iter) & SEC_ALLOC) != 0) if ((bfd_section_flags (sect_iter) & SEC_ALLOC) != 0)
bfd_set_section_vma (sect_iter, addr + bfd_section_vma (sect_iter)); bfd_set_section_vma (sect_iter, addr + bfd_section_vma (sect_iter));
data->last_size = 0; m_last_size = 0;
data->last_section_first = sect; m_last_section_first = sect;
data->last_prot = prot; m_last_prot = prot;
data->last_max_alignment = 1; m_last_max_alignment = 1;
} }
if (sect == NULL) if (sect == NULL)
return; return;
alignment = ((CORE_ADDR) 1) << bfd_section_alignment (sect); alignment = ((CORE_ADDR) 1) << bfd_section_alignment (sect);
data->last_max_alignment = std::max (data->last_max_alignment, alignment); m_last_max_alignment = std::max (m_last_max_alignment, alignment);
data->last_size = (data->last_size + alignment - 1) & -alignment; m_last_size = (m_last_size + alignment - 1) & -alignment;
bfd_set_section_vma (sect, data->last_size); bfd_set_section_vma (sect, m_last_size);
data->last_size += bfd_section_size (sect); m_last_size += bfd_section_size (sect);
data->last_size = (data->last_size + alignment - 1) & -alignment; m_last_size = (m_last_size + alignment - 1) & -alignment;
} }
/* Helper for link_callbacks callbacks vector. */ /* Helper for link_callbacks callbacks vector. */
@ -586,7 +602,6 @@ compile_module_up
compile_object_load (const compile_file_names &file_names, compile_object_load (const compile_file_names &file_names,
enum compile_i_scope_types scope, void *scope_data) enum compile_i_scope_types scope, void *scope_data)
{ {
struct setup_sections_data setup_sections_data;
CORE_ADDR regs_addr, out_value_addr = 0; CORE_ADDR regs_addr, out_value_addr = 0;
struct symbol *func_sym; struct symbol *func_sym;
struct type *func_type; struct type *func_type;
@ -616,14 +631,10 @@ compile_object_load (const compile_file_names &file_names,
if ((bfd_get_file_flags (abfd.get ()) & (EXEC_P | DYNAMIC)) != 0) if ((bfd_get_file_flags (abfd.get ()) & (EXEC_P | DYNAMIC)) != 0)
error (_("\"%s\": not in object format."), filename.get ()); error (_("\"%s\": not in object format."), filename.get ());
setup_sections_data.last_size = 0; struct setup_sections_data setup_sections_data (abfd.get ());
setup_sections_data.last_section_first = abfd->sections; for (asection *sect = abfd->sections; sect != nullptr; sect = sect->next)
setup_sections_data.last_prot = -1; setup_sections_data.setup_one_section (sect);
setup_sections_data.last_max_alignment = 1; setup_sections_data.setup_one_section (nullptr);
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 ()); storage_needed = bfd_get_symtab_upper_bound (abfd.get ());
if (storage_needed < 0) if (storage_needed < 0)
@ -757,7 +768,7 @@ compile_object_load (const compile_file_names &file_names,
TYPE_LENGTH (regs_type), TYPE_LENGTH (regs_type),
GDB_MMAP_PROT_READ); GDB_MMAP_PROT_READ);
gdb_assert (regs_addr != 0); gdb_assert (regs_addr != 0);
setup_sections_data.munmap_list->add (regs_addr, TYPE_LENGTH (regs_type)); setup_sections_data.munmap_list.add (regs_addr, TYPE_LENGTH (regs_type));
if (compile_debug) if (compile_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"allocated %s bytes at %s for registers\n", "allocated %s bytes at %s for registers\n",
@ -779,7 +790,7 @@ compile_object_load (const compile_file_names &file_names,
(GDB_MMAP_PROT_READ (GDB_MMAP_PROT_READ
| GDB_MMAP_PROT_WRITE)); | GDB_MMAP_PROT_WRITE));
gdb_assert (out_value_addr != 0); gdb_assert (out_value_addr != 0);
setup_sections_data.munmap_list->add (out_value_addr, setup_sections_data.munmap_list.add (out_value_addr,
TYPE_LENGTH (out_value_type)); TYPE_LENGTH (out_value_type));
if (compile_debug) if (compile_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
@ -791,14 +802,14 @@ compile_object_load (const compile_file_names &file_names,
compile_module_up retval (new struct compile_module); compile_module_up retval (new struct compile_module);
retval->objfile = objfile_holder.release (); retval->objfile = objfile_holder.release ();
retval->source_file = xstrdup (file_names.source_file ()); retval->source_file = file_names.source_file ();
retval->func_sym = func_sym; retval->func_sym = func_sym;
retval->regs_addr = regs_addr; retval->regs_addr = regs_addr;
retval->scope = scope; retval->scope = scope;
retval->scope_data = scope_data; retval->scope_data = scope_data;
retval->out_value_type = out_value_type; retval->out_value_type = out_value_type;
retval->out_value_addr = out_value_addr; retval->out_value_addr = out_value_addr;
retval->munmap_list_head = setup_sections_data.munmap_list.release (); retval->munmap_list = std::move (setup_sections_data.munmap_list);
return retval; return retval;
} }

8
gdb/compile/compile-object-load.h
View file

@ -29,6 +29,8 @@ public:
DISABLE_COPY_AND_ASSIGN (munmap_list); DISABLE_COPY_AND_ASSIGN (munmap_list);
munmap_list &operator= (munmap_list &&) = default;
/* Add a region to the list. */ /* Add a region to the list. */
void add (CORE_ADDR addr, CORE_ADDR size); void add (CORE_ADDR addr, CORE_ADDR size);
@ -56,8 +58,8 @@ struct compile_module
/* objfile for the compiled module. */ /* objfile for the compiled module. */
struct objfile *objfile; struct objfile *objfile;
/* .c file OBJFILE was built from. It needs to be xfree-d. */ /* .c file OBJFILE was built from. */
char *source_file; std::string source_file;
/* Inferior function GCC_FE_WRAPPER_FUNCTION. */ /* Inferior function GCC_FE_WRAPPER_FUNCTION. */
struct symbol *func_sym; struct symbol *func_sym;
@ -81,7 +83,7 @@ struct compile_module
CORE_ADDR out_value_addr; CORE_ADDR out_value_addr;
/* Track inferior memory reserved by inferior mmap. */ /* Track inferior memory reserved by inferior mmap. */
struct munmap_list *munmap_list_head; struct munmap_list munmap_list;
}; };
/* A unique pointer for a compile_module. */ /* A unique pointer for a compile_module. */

8
gdb/compile/compile-object-run.c
View file

@ -38,12 +38,6 @@ struct do_module_cleanup
{ {
} }
~do_module_cleanup ()
{
delete module->munmap_list_head;
xfree (module->source_file);
}
DISABLE_COPY_AND_ASSIGN (do_module_cleanup); DISABLE_COPY_AND_ASSIGN (do_module_cleanup);
/* Boolean to set true upon a call of do_module_cleanup. /* Boolean to set true upon a call of do_module_cleanup.
@ -102,7 +96,7 @@ do_module_cleanup (void *arg, int registers_valid)
} }
/* Delete the .c file. */ /* Delete the .c file. */
unlink (data->module->source_file); unlink (data->module->source_file.c_str ());
/* Delete the .o file. */ /* Delete the .o file. */
unlink (objfile_name_s.c_str ()); unlink (objfile_name_s.c_str ());