This patch makes the gdb_symtab bit more c++y, in preparation for the
next patch that will use an std::forward_list<gdb_symtab>. It changes
the fields to use automatic memory management, in the form of
std::string and gdb::unique_xmalloc_ptr, and adds a constructor and a
destructor.
gdb/ChangeLog:
* jit.c (struct gdb_symtab): Add constructor, destructor,
initialize fields.
<linetable>: Change type to unique_xmalloc_ptr.
<file_name>: Change type to std::string.
(jit_symtab_open_impl): Allocate gdb_symtab with new.
(jit_symtab_line_mapping_add_impl): Adjust.
(finalize_symtab): Adjust, call delete on stab.
+2019-12-16 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * jit.c (struct gdb_symtab): Add constructor, destructor,
+ initialize fields.
+ <linetable>: Change type to unique_xmalloc_ptr.
+ <file_name>: Change type to std::string.
+ (jit_symtab_open_impl): Allocate gdb_symtab with new.
+ (jit_symtab_line_mapping_add_impl): Adjust.
+ (finalize_symtab): Adjust, call delete on stab.
+
2019-12-16 Simon Marchi <simon.marchi@polymtl.ca>
* jit.c (finalize_symtab): Set gdb_block_iter_tmp in loop.
2019-12-16 Simon Marchi <simon.marchi@polymtl.ca>
* jit.c (finalize_symtab): Set gdb_block_iter_tmp in loop.
+ explicit gdb_symtab (const char *file_name)
+ : file_name (file_name != nullptr ? file_name : "")
+ {}
+
+ ~gdb_symtab ()
+ {
+ gdb_block *gdb_block_iter, *gdb_block_iter_tmp;
+
+ for ((gdb_block_iter = this->blocks,
+ gdb_block_iter_tmp = gdb_block_iter->next);
+ gdb_block_iter;
+ gdb_block_iter = gdb_block_iter_tmp)
+ {
+ gdb_block_iter_tmp = gdb_block_iter->next;
+ xfree ((void *) gdb_block_iter->name);
+ xfree (gdb_block_iter);
+ }
+ }
+
/* The list of blocks in this symtab. These will eventually be
converted to real blocks. */
/* The list of blocks in this symtab. These will eventually be
converted to real blocks. */
- struct gdb_block *blocks;
+ struct gdb_block *blocks = nullptr;
/* The number of blocks inserted. */
/* The number of blocks inserted. */
/* A mapping between line numbers to PC. */
/* A mapping between line numbers to PC. */
- struct linetable *linetable;
+ gdb::unique_xmalloc_ptr<struct linetable> linetable;
/* The source file for this symtab. */
/* The source file for this symtab. */
- const char *file_name;
- struct gdb_symtab *next;
+ std::string file_name;
+
+ struct gdb_symtab *next = nullptr;
};
/* Proxy object for building an object. */
};
/* Proxy object for building an object. */
struct gdb_object *object,
const char *file_name)
{
struct gdb_object *object,
const char *file_name)
{
- struct gdb_symtab *ret;
-
/* CB stays unused. See comment in jit_object_open_impl. */
/* CB stays unused. See comment in jit_object_open_impl. */
- ret = XCNEW (struct gdb_symtab);
- ret->file_name = file_name ? xstrdup (file_name) : xstrdup ("");
+ gdb_symtab *ret = new gdb_symtab (file_name);
ret->next = object->symtabs;
object->symtabs = ret;
return ret;
ret->next = object->symtabs;
object->symtabs = ret;
return ret;
alloc_len = sizeof (struct linetable)
+ (nlines - 1) * sizeof (struct linetable_entry);
alloc_len = sizeof (struct linetable)
+ (nlines - 1) * sizeof (struct linetable_entry);
- stab->linetable = (struct linetable *) xmalloc (alloc_len);
+ stab->linetable.reset (XNEWVAR (struct linetable, alloc_len));
stab->linetable->nitems = nlines;
for (i = 0; i < nlines; i++)
{
stab->linetable->nitems = nlines;
for (i = 0; i < nlines; i++)
{
finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
{
struct compunit_symtab *cust;
finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
{
struct compunit_symtab *cust;
- struct gdb_block *gdb_block_iter, *gdb_block_iter_tmp;
+ struct gdb_block *gdb_block_iter;
struct block *block_iter;
int actual_nblocks, i;
size_t blockvector_size;
struct block *block_iter;
int actual_nblocks, i;
size_t blockvector_size;
actual_nblocks = FIRST_LOCAL_BLOCK + stab->nblocks;
actual_nblocks = FIRST_LOCAL_BLOCK + stab->nblocks;
- cust = allocate_compunit_symtab (objfile, stab->file_name);
- allocate_symtab (cust, stab->file_name);
+ cust = allocate_compunit_symtab (objfile, stab->file_name.c_str ());
+ allocate_symtab (cust, stab->file_name.c_str ());
add_compunit_symtab_to_objfile (cust);
/* JIT compilers compile in memory. */
add_compunit_symtab_to_objfile (cust);
/* JIT compilers compile in memory. */
+ sizeof (struct linetable));
SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust))
= (struct linetable *) obstack_alloc (&objfile->objfile_obstack, size);
+ sizeof (struct linetable));
SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust))
= (struct linetable *) obstack_alloc (&objfile->objfile_obstack, size);
- memcpy (SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust)), stab->linetable,
- size);
+ memcpy (SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust)),
+ stab->linetable.get (), size);
}
blockvector_size = (sizeof (struct blockvector)
}
blockvector_size = (sizeof (struct blockvector)
- /* Free memory. */
- gdb_block_iter = stab->blocks;
-
- for (gdb_block_iter = stab->blocks, gdb_block_iter_tmp = gdb_block_iter->next;
- gdb_block_iter;
- gdb_block_iter = gdb_block_iter_tmp)
- {
- gdb_block_iter_tmp = gdb_block_iter->next;
- xfree ((void *) gdb_block_iter->name);
- xfree (gdb_block_iter);
- }
- xfree (stab->linetable);
- xfree ((char *) stab->file_name);
- xfree (stab);
}
/* Called when closing a gdb_objfile. Converts OBJ to a proper
}
/* Called when closing a gdb_objfile. Converts OBJ to a proper