/* Top level stuff for GDB, the GNU debugger.
- Copyright (C) 1986-2016 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include <signal.h>
#include "event-top.h"
#include "infrun.h"
+#include "signals-state-save-restore.h"
+#include <vector>
/* The selected interpreter. This will be used as a set command
variable, so it should always be malloc'ed - since
warning (_("%s is not a directory."), new_datadir);
xfree (gdb_datadir);
- gdb_datadir = gdb_realpath (new_datadir);
+ gdb_datadir = gdb_realpath (new_datadir).release ();
/* gdb_realpath won't return an absolute path if the path doesn't exist,
but we still want to record an absolute path here. If the user entered
isn't canonical, but that's ok. */
if (!IS_ABSOLUTE_PATH (gdb_datadir))
{
- char *abs_datadir = gdb_abspath (gdb_datadir);
+ gdb::unique_xmalloc_ptr<char> abs_datadir = gdb_abspath (gdb_datadir);
xfree (gdb_datadir);
- gdb_datadir = abs_datadir;
+ gdb_datadir = abs_datadir.release ();
}
}
{
/* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR
to gdb_datadir. */
- char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + datadir_len);
+ char *tmp_sys_gdbinit = xstrdup (&SYSTEM_GDBINIT[datadir_len]);
char *p;
for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p)
#endif
}
-/* Call command_loop. If it happens to return, pass that through as a
- non-zero return status. */
+/* Call command_loop. */
-static int
-captured_command_loop (void *data)
+/* Prevent inlining this function for the benefit of GDB's selftests
+ in the testsuite. Those tests want to run GDB under GDB and stop
+ here. */
+static void captured_command_loop () __attribute__((noinline));
+
+static void
+captured_command_loop ()
{
struct ui *ui = current_ui;
check to detect bad FUNCs code. */
do_cleanups (all_cleanups ());
/* If the command_loop returned, normally (rather than threw an
- error) we try to quit. If the quit is aborted, catch_errors()
- which called this catch the signal and restart the command
- loop. */
- quit_command (NULL, ui->instream == stdin);
- return 1;
+ error) we try to quit. If the quit is aborted, our caller
+ catches the signal and restarts the command loop. */
+ quit_command (NULL, ui->instream == ui->stdin_stream);
}
-/* Handle command errors thrown from within
- catch_command_errors/catch_command_errors_const. */
+/* Handle command errors thrown from within catch_command_errors. */
static int
handle_command_errors (struct gdb_exception e)
return 1;
}
-/* Type of the command callback passed to catch_command_errors. */
+/* Type of the command callback passed to the const
+ catch_command_errors. */
-typedef void (catch_command_errors_ftype) (char *, int);
+typedef void (catch_command_errors_const_ftype) (const char *, int);
/* Wrap calls to commands run before the event loop is started. */
static int
-catch_command_errors (catch_command_errors_ftype *command,
- char *arg, int from_tty)
+catch_command_errors (catch_command_errors_const_ftype command,
+ const char *arg, int from_tty)
{
TRY
{
return 1;
}
-/* Type of the command callback passed to catch_command_errors_const. */
+/* Adapter for symbol_file_add_main that translates 'from_tty' to a
+ symfile_add_flags. */
-typedef void (catch_command_errors_const_ftype) (const char *, int);
-
-/* Like catch_command_errors, but works with const command and args. */
-
-static int
-catch_command_errors_const (catch_command_errors_const_ftype *command,
- const char *arg, int from_tty)
+static void
+symbol_file_add_main_adapter (const char *arg, int from_tty)
{
- TRY
- {
- int was_sync = current_ui->prompt_state == PROMPT_BLOCKED;
-
- command (arg, from_tty);
+ symfile_add_flags add_flags = 0;
- maybe_wait_sync_command_done (was_sync);
- }
- CATCH (e, RETURN_MASK_ALL)
- {
- return handle_command_errors (e);
- }
- END_CATCH
+ if (from_tty)
+ add_flags |= SYMFILE_VERBOSE;
- return 1;
+ symbol_file_add_main (arg, add_flags);
}
/* Type of this option. */
};
/* Arguments of --command option and its counterpart. */
-typedef struct cmdarg {
+struct cmdarg
+{
+ cmdarg (cmdarg_kind type_, char *string_)
+ : type (type_), string (string_)
+ {}
+
/* Type of this option. */
enum cmdarg_kind type;
/* Value of this option - filename or the GDB command itself. String memory
is not owned by this structure despite it is 'const'. */
char *string;
-} cmdarg_s;
-
-/* Define type VEC (cmdarg_s). */
-DEF_VEC_O (cmdarg_s);
+};
-static int
-captured_main (void *data)
+static void
+captured_main_1 (struct captured_main_args *context)
{
- struct captured_main_args *context = (struct captured_main_args *) data;
int argc = context->argc;
char **argv = context->argv;
+
static int quiet = 0;
static int set_args = 0;
static int inhibit_home_gdbinit = 0;
static int print_configuration;
/* Pointers to all arguments of --command option. */
- VEC (cmdarg_s) *cmdarg_vec = NULL;
- struct cmdarg *cmdarg_p;
+ std::vector<struct cmdarg> cmdarg_vec;
- /* Indices of all arguments of --directory option. */
- char **dirarg;
- /* Allocated size. */
- int dirsize;
- /* Number of elements used. */
- int ndir;
+ /* All arguments of --directory option. */
+ std::vector<char *> dirarg;
/* gdb init files. */
const char *system_gdbinit;
int save_auto_load;
struct objfile *objfile;
- struct cleanup *pre_stat_chain;
-
#ifdef HAVE_SBRK
- /* Set this before calling make_command_stats_cleanup. */
+ /* Set this before constructing scoped_command_stats. */
lim_at_start = (char *) sbrk (0);
#endif
- pre_stat_chain = make_command_stats_cleanup (0);
+ scoped_command_stats stat_reporter (false);
#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
setlocale (LC_MESSAGES, "");
#if defined (HAVE_SETLOCALE)
setlocale (LC_CTYPE, "");
#endif
+#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+#endif
bfd_init ();
notice_open_fds ();
-
- make_cleanup (VEC_cleanup (cmdarg_s), &cmdarg_vec);
- dirsize = 1;
- dirarg = (char **) xmalloc (dirsize * sizeof (*dirarg));
- ndir = 0;
+ save_original_signals_state ();
saved_command_line = (char *) xstrdup ("");
setvbuf (stderr, NULL, _IONBF, BUFSIZ);
#endif
- main_ui = new_ui (stdin, stdout, stderr);
+ main_ui = new ui (stdin, stdout, stderr);
current_ui = main_ui;
gdb_stdtargerr = gdb_stderr; /* for moment */
#endif
/* Prefix warning messages with the command name. */
- warning_pre_print = xstrprintf ("%s: warning: ", gdb_program_name);
+ gdb::unique_xmalloc_ptr<char> tmp_warn_preprint
+ (xstrprintf ("%s: warning: ", gdb_program_name));
+ warning_pre_print = tmp_warn_preprint.get ();
- if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
+ current_directory = getcwd (NULL, 0);
+ if (current_directory == NULL)
perror_warning_with_name (_("error finding working directory"));
- current_directory = gdb_dirbuf;
-
/* Set the sysroot path. */
gdb_sysroot = relocate_gdb_directory (TARGET_SYSTEM_ROOT,
TARGET_SYSTEM_ROOT_RELOCATABLE);
pidarg = optarg;
break;
case 'x':
- {
- struct cmdarg cmdarg = { CMDARG_FILE, optarg };
-
- VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
- }
+ cmdarg_vec.emplace_back (CMDARG_FILE, optarg);
break;
case 'X':
- {
- struct cmdarg cmdarg = { CMDARG_COMMAND, optarg };
-
- VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
- }
+ cmdarg_vec.emplace_back (CMDARG_COMMAND, optarg);
break;
case OPT_IX:
- {
- struct cmdarg cmdarg = { CMDARG_INIT_FILE, optarg };
-
- VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
- }
+ cmdarg_vec.emplace_back (CMDARG_INIT_FILE, optarg);
break;
case OPT_IEX:
- {
- struct cmdarg cmdarg = { CMDARG_INIT_COMMAND, optarg };
-
- VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
- }
+ cmdarg_vec.emplace_back (CMDARG_INIT_COMMAND, optarg);
break;
case 'B':
batch_flag = batch_silent = 1;
- gdb_stdout = ui_file_new();
+ gdb_stdout = new null_file ();
break;
case 'D':
if (optarg[0] == '\0')
interpreter_p = xstrdup (optarg);
break;
case 'd':
- dirarg[ndir++] = optarg;
- if (ndir >= dirsize)
- {
- dirsize *= 2;
- dirarg = (char **) xrealloc ((char *) dirarg,
- dirsize * sizeof (*dirarg));
- }
+ dirarg.push_back (optarg);
break;
case 't':
ttyarg = optarg;
/* Install the default UI. All the interpreters should have had a
look at things by now. Initialize the default interpreter. */
-
- {
- /* Find it. */
- struct interp *interp = interp_lookup (current_ui, interpreter_p);
-
- if (interp == NULL)
- error (_("Interpreter `%s' unrecognized"), interpreter_p);
- /* Install it. */
- if (!interp_set (interp, 1))
- error (_("Interpreter `%s' failed to initialize."), interpreter_p);
- }
+ set_top_level_interpreter (interpreter_p);
/* FIXME: cagney/2003-02-03: The big hack (part 2 of 2) that lets
GDB retain the old MI1 interpreter startup behavior. Output the
}
/* Set off error and warning messages with a blank line. */
- xfree (warning_pre_print);
+ tmp_warn_preprint.reset ();
warning_pre_print = _("\nwarning: ");
/* Read and execute the system-wide gdbinit file, if it exists.
processed; it sets global parameters, which are independent of
what file you are debugging or what directory you are in. */
if (system_gdbinit && !inhibit_gdbinit)
- catch_command_errors_const (source_script, system_gdbinit, 0);
+ catch_command_errors (source_script, system_gdbinit, 0);
/* Read and execute $HOME/.gdbinit file, if it exists. This is done
*before* all the command line arguments are processed; it sets
debugging or what directory you are in. */
if (home_gdbinit && !inhibit_gdbinit && !inhibit_home_gdbinit)
- catch_command_errors_const (source_script, home_gdbinit, 0);
+ catch_command_errors (source_script, home_gdbinit, 0);
/* Process '-ix' and '-iex' options early. */
- for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
- switch (cmdarg_p->type)
+ for (i = 0; i < cmdarg_vec.size (); i++)
{
- case CMDARG_INIT_FILE:
- catch_command_errors_const (source_script, cmdarg_p->string,
- !batch_flag);
- break;
- case CMDARG_INIT_COMMAND:
- catch_command_errors (execute_command, cmdarg_p->string,
- !batch_flag);
- break;
+ const struct cmdarg &cmdarg_p = cmdarg_vec[i];
+
+ switch (cmdarg_p.type)
+ {
+ case CMDARG_INIT_FILE:
+ catch_command_errors (source_script, cmdarg_p.string,
+ !batch_flag);
+ break;
+ case CMDARG_INIT_COMMAND:
+ catch_command_errors (execute_command, cmdarg_p.string,
+ !batch_flag);
+ break;
+ }
}
/* Now perform all the actions indicated by the arguments. */
catch_command_errors (cd_command, cdarg, 0);
}
- for (i = 0; i < ndir; i++)
+ for (i = 0; i < dirarg.size (); i++)
catch_command_errors (directory_switch, dirarg[i], 0);
- xfree (dirarg);
/* Skip auto-loading section-specified scripts until we've sourced
local_gdbinit (which is often used to augment the source search
/* The exec file and the symbol-file are the same. If we can't
open it, better only print one error message.
catch_command_errors returns non-zero on success! */
- if (catch_command_errors_const (exec_file_attach, execarg,
- !batch_flag))
- catch_command_errors_const (symbol_file_add_main, symarg,
- !batch_flag);
+ if (catch_command_errors (exec_file_attach, execarg,
+ !batch_flag))
+ catch_command_errors (symbol_file_add_main_adapter, symarg,
+ !batch_flag);
}
else
{
if (execarg != NULL)
- catch_command_errors_const (exec_file_attach, execarg,
- !batch_flag);
+ catch_command_errors (exec_file_attach, execarg,
+ !batch_flag);
if (symarg != NULL)
- catch_command_errors_const (symbol_file_add_main, symarg,
- !batch_flag);
+ catch_command_errors (symbol_file_add_main_adapter, symarg,
+ !batch_flag);
}
if (corearg && pidarg)
the same as the $HOME/.gdbinit file (it should exist, also). */
if (local_gdbinit)
{
- auto_load_local_gdbinit_pathname = gdb_realpath (local_gdbinit);
+ auto_load_local_gdbinit_pathname
+ = gdb_realpath (local_gdbinit).release ();
if (!inhibit_gdbinit && auto_load_local_gdbinit
&& file_is_auto_load_safe (local_gdbinit,
{
auto_load_local_gdbinit_loaded = 1;
- catch_command_errors_const (source_script, local_gdbinit, 0);
+ catch_command_errors (source_script, local_gdbinit, 0);
}
}
load_auto_scripts_for_objfile (objfile);
/* Process '-x' and '-ex' options. */
- for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
- switch (cmdarg_p->type)
+ for (i = 0; i < cmdarg_vec.size (); i++)
{
- case CMDARG_FILE:
- catch_command_errors_const (source_script, cmdarg_p->string,
- !batch_flag);
- break;
- case CMDARG_COMMAND:
- catch_command_errors (execute_command, cmdarg_p->string,
- !batch_flag);
- break;
+ const struct cmdarg &cmdarg_p = cmdarg_vec[i];
+
+ switch (cmdarg_p.type)
+ {
+ case CMDARG_FILE:
+ catch_command_errors (source_script, cmdarg_p.string,
+ !batch_flag);
+ break;
+ case CMDARG_COMMAND:
+ catch_command_errors (execute_command, cmdarg_p.string,
+ !batch_flag);
+ break;
+ }
}
/* Read in the old history after all the command files have been
/* We have hit the end of the batch file. */
quit_force (NULL, 0);
}
+}
- /* Show time and/or space usage. */
- do_cleanups (pre_stat_chain);
+static void
+captured_main (void *data)
+{
+ struct captured_main_args *context = (struct captured_main_args *) data;
+
+ captured_main_1 (context);
/* NOTE: cagney/1999-11-07: There is probably no reason for not
moving this loop and the code found in captured_command_loop()
change - SET_TOP_LEVEL() - has been eliminated. */
while (1)
{
- catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
+ TRY
+ {
+ captured_command_loop ();
+ }
+ CATCH (ex, RETURN_MASK_ALL)
+ {
+ exception_print (gdb_stderr, ex);
+ }
+ END_CATCH
}
/* No exit -- exit is through quit_command. */
}
projects / deliverable / binutils-gdb.git / blobdiff