/* Load module for 'compile' command.
- Copyright (C) 2014-2017 Free Software Foundation, Inc.
+ Copyright (C) 2014-2018 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbcmd.h"
#include "regcache.h"
#include "inferior.h"
+#include "gdbthread.h"
#include "compile.h"
#include "block.h"
#include "arch-utils.h"
static void
link_callbacks_einfo (const char *fmt, ...)
{
- struct cleanup *cleanups;
va_list ap;
- char *str;
va_start (ap, fmt);
- str = xstrvprintf (fmt, ap);
+ std::string str = string_vprintf (fmt, ap);
va_end (ap);
- cleanups = make_cleanup (xfree, str);
-
- warning (_("Compile module: warning: %s"), str);
- do_cleanups (cleanups);
+ warning (_("Compile module: warning: %s"), str.c_str ());
}
/* Helper for bfd_get_relocated_section_contents.
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;
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);
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++)
compile_object_load (const compile_file_names &file_names,
enum compile_i_scope_types scope, void *scope_data)
{
- struct cleanup *cleanups, *cleanups_free_objfile;
+ struct cleanup *cleanups;
struct setup_sections_data setup_sections_data;
- CORE_ADDR addr, regs_addr, out_value_addr = 0;
+ CORE_ADDR regs_addr, out_value_addr = 0;
struct symbol *func_sym;
struct type *func_type;
struct bound_minimal_symbol bmsym;
long storage_needed;
asymbol **symbol_table, **symp;
long number_of_symbols, missing_symbols;
- struct type *dptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
- unsigned dptr_type_len = TYPE_LENGTH (dptr_type);
struct compile_module *retval;
struct type *regs_type, *out_value_type = NULL;
- char *filename, **matching;
+ char **matching;
struct objfile *objfile;
int expect_parameters;
struct type *expect_return_type;
struct munmap_list *munmap_list_head = NULL;
- filename = tilde_expand (file_names.object_file ());
- cleanups = make_cleanup (xfree, filename);
+ gdb::unique_xmalloc_ptr<char> filename
+ (tilde_expand (file_names.object_file ()));
- gdb_bfd_ref_ptr abfd (gdb_bfd_open (filename, gnutarget, -1));
+ gdb_bfd_ref_ptr abfd (gdb_bfd_open (filename.get (), gnutarget, -1));
if (abfd == NULL)
error (_("\"%s\": could not open as compiled module: %s"),
- filename, bfd_errmsg (bfd_get_error ()));
+ filename.get (), bfd_errmsg (bfd_get_error ()));
if (!bfd_check_format_matches (abfd.get (), bfd_object, &matching))
error (_("\"%s\": not in loadable format: %s"),
- filename, gdb_bfd_errmsg (bfd_get_error (), matching));
+ filename.get (), gdb_bfd_errmsg (bfd_get_error (), matching));
if ((bfd_get_file_flags (abfd.get ()) & (EXEC_P | DYNAMIC)) != 0)
- error (_("\"%s\": not in object format."), filename);
+ error (_("\"%s\": not in object format."), filename.get ());
setup_sections_data.last_size = 0;
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;
- make_cleanup (munmap_listp_free_cleanup, &munmap_list_head);
+ cleanups = make_cleanup (munmap_listp_free_cleanup, &munmap_list_head);
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, 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. */
- objfile = symbol_file_add_from_bfd (abfd.get (), filename, 0, NULL, 0, NULL);
- cleanups_free_objfile = make_cleanup_free_objfile (objfile);
+ std::unique_ptr<struct objfile> 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,
GCC_FE_WRAPPER_FUNCTION,
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, 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++)
default:
warning (_("Could not find symbol \"%s\" "
"for compiled module \"%s\"."),
- sym->name, filename);
+ sym->name, filename.get ());
missing_symbols++;
}
}
paddress (target_gdbarch (), out_value_addr));
}
- discard_cleanups (cleanups_free_objfile);
-
retval = XNEW (struct compile_module);
- retval->objfile = objfile;
+ retval->objfile = objfile_holder.release ();
retval->source_file = xstrdup (file_names.source_file ());
retval->func_sym = func_sym;
retval->regs_addr = regs_addr;