X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmain.c;h=df4b1110d6b59cb9316c2c51bd93141102a4d632;hb=f65e204425b5b46a5927d9501c42f25d98a866ce;hp=440094ef27152c04474bd77811e99f94d8b24c9b;hpb=b187bec1eb65109af52a83aae69eb81e036882a6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/main.c b/gdb/main.c index 440094ef27..df4b1110d6 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1,6 +1,6 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright (C) 1986-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -23,15 +23,11 @@ #include "inferior.h" #include "symfile.h" #include "gdbcore.h" - -#include "exceptions.h" #include "getopt.h" #include -#include "gdb_stat.h" +#include #include - -#include "gdb_string.h" #include "event-loop.h" #include "ui-out.h" @@ -39,22 +35,23 @@ #include "main.h" #include "source.h" #include "cli/cli-cmds.h" -#include "python/python.h" #include "objfiles.h" #include "auto-load.h" #include "maint.h" #include "filenames.h" #include "filestuff.h" +#include +#include "event-top.h" +#include "infrun.h" +#include "signals-state-save-restore.h" +#include /* The selected interpreter. This will be used as a set command variable, so it should always be malloc'ed - since do_setshow_command will free it. */ char *interpreter_p; -/* Whether xdb commands will be handled. */ -int xdb_commands = 0; - /* Whether dbx commands will be handled. */ int dbx_commands = 0; @@ -73,10 +70,6 @@ static int gdb_datadir_provided = 0; the possibly relocated path to python's lib directory. */ char *python_libdir = 0; -struct ui_file *gdb_stdout; -struct ui_file *gdb_stderr; -struct ui_file *gdb_stdlog; -struct ui_file *gdb_stdin; /* Target IO streams. */ struct ui_file *gdb_stdtargin; struct ui_file *gdb_stdtarg; @@ -98,8 +91,50 @@ int return_child_result_value = -1; /* GDB as it has been invoked from the command line (i.e. argv[0]). */ static char *gdb_program_name; +/* Return read only pointer to GDB_PROGRAM_NAME. */ +const char * +get_gdb_program_name (void) +{ + return gdb_program_name; +} + static void print_gdb_help (struct ui_file *); +/* Set the data-directory parameter to NEW_DATADIR. + If NEW_DATADIR is not a directory then a warning is printed. + We don't signal an error for backward compatibility. */ + +void +set_gdb_data_directory (const char *new_datadir) +{ + struct stat st; + + if (stat (new_datadir, &st) < 0) + { + int save_errno = errno; + + fprintf_unfiltered (gdb_stderr, "Warning: "); + print_sys_errmsg (new_datadir, save_errno); + } + else if (!S_ISDIR (st.st_mode)) + warning (_("%s is not a directory."), new_datadir); + + xfree (gdb_datadir); + gdb_datadir = gdb_realpath (new_datadir); + + /* 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 + "../foo" and "../foo" doesn't exist then we'll record $(pwd)/../foo which + isn't canonical, but that's ok. */ + if (!IS_ABSOLUTE_PATH (gdb_datadir)) + { + char *abs_datadir = gdb_abspath (gdb_datadir); + + xfree (gdb_datadir); + gdb_datadir = abs_datadir; + } +} + /* Relocate a file or directory. PROGNAME is the name by which gdb was invoked (i.e., argv[0]). INITIAL is the default value for the file or directory. FLAG is true if the value is relocatable, false @@ -195,7 +230,7 @@ get_init_files (const char **system_gdbinit, for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p) continue; relocated_sysgdbinit = concat (gdb_datadir, SLASH_STRING, p, - NULL); + (char *) NULL); xfree (tmp_sys_gdbinit); } else @@ -247,17 +282,48 @@ get_init_files (const char **system_gdbinit, *local_gdbinit = localinit; } +/* Try to set up an alternate signal stack for SIGSEGV handlers. + This allows us to handle SIGSEGV signals generated when the + normal process stack is exhausted. If this stack is not set + up (sigaltstack is unavailable or fails) and a SIGSEGV is + generated when the normal stack is exhausted then the program + will behave as though no SIGSEGV handler was installed. */ + +static void +setup_alternate_signal_stack (void) +{ +#ifdef HAVE_SIGALTSTACK + stack_t ss; + + /* FreeBSD versions older than 11.0 use char * for ss_sp instead of + void *. This cast works with both types. */ + ss.ss_sp = (char *) xmalloc (SIGSTKSZ); + ss.ss_size = SIGSTKSZ; + ss.ss_flags = 0; + + sigaltstack(&ss, NULL); +#endif +} + /* Call command_loop. If it happens to return, pass that through as a non-zero return status. */ static int captured_command_loop (void *data) { - /* Top-level execution commands can be run on the background from + struct ui *ui = current_ui; + + /* Top-level execution commands can be run in the background from here on. */ - interpreter_async = 1; + current_ui->async = 1; + + /* Give the interpreter a chance to print a prompt, if necessary */ + if (ui->prompt_state != PROMPT_BLOCKED) + interp_pre_command_loop (top_level_interpreter ()); + + /* Now it's time to start the event loop. */ + start_event_loop (); - current_interp_command_loop (); /* FIXME: cagney/1999-11-05: A correct command_loop() implementaton would clean things up (restoring the cleanup chain) to the state they were just prior to the call. Technically, this means that @@ -270,41 +336,134 @@ captured_command_loop (void *data) 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, instream == stdin); + quit_command (NULL, ui->instream == ui->stdin_stream); return 1; } -/* Arguments of --command option and its counterpart. */ -typedef struct cmdarg { - /* Type of this option. */ - enum { - /* Option type -x. */ - CMDARG_FILE, +/* Handle command errors thrown from within + catch_command_errors/catch_command_errors_const. */ + +static int +handle_command_errors (struct gdb_exception e) +{ + if (e.reason < 0) + { + exception_print (gdb_stderr, e); + + /* If any exception escaped to here, we better enable stdin. + Otherwise, any command that calls async_disable_stdin, and + then throws, will leave stdin inoperable. */ + async_enable_stdin (); + return 0; + } + return 1; +} + +/* Type of the command callback passed to catch_command_errors. */ + +typedef void (catch_command_errors_ftype) (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) +{ + TRY + { + int was_sync = current_ui->prompt_state == PROMPT_BLOCKED; + + command (arg, from_tty); + + maybe_wait_sync_command_done (was_sync); + } + CATCH (e, RETURN_MASK_ALL) + { + return handle_command_errors (e); + } + END_CATCH + + return 1; +} + +/* Type of the command callback passed to catch_command_errors_const. */ + +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) +{ + TRY + { + int was_sync = current_ui->prompt_state == PROMPT_BLOCKED; + + command (arg, from_tty); + + maybe_wait_sync_command_done (was_sync); + } + CATCH (e, RETURN_MASK_ALL) + { + return handle_command_errors (e); + } + END_CATCH + + return 1; +} + +/* Adapter for symbol_file_add_main that translates 'from_tty' to a + symfile_add_flags. */ + +static void +symbol_file_add_main_adapter (const char *arg, int from_tty) +{ + symfile_add_flags add_flags = 0; + + if (from_tty) + add_flags |= SYMFILE_VERBOSE; - /* Option type -ex. */ - CMDARG_COMMAND, + symbol_file_add_main (arg, add_flags); +} + +/* Type of this option. */ +enum cmdarg_kind +{ + /* Option type -x. */ + CMDARG_FILE, - /* Option type -ix. */ - CMDARG_INIT_FILE, + /* Option type -ex. */ + CMDARG_COMMAND, + + /* Option type -ix. */ + CMDARG_INIT_FILE, - /* Option type -iex. */ - CMDARG_INIT_COMMAND - } type; + /* Option type -iex. */ + CMDARG_INIT_COMMAND +}; + +/* Arguments of --command option and its counterpart. */ +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 = data; int argc = context->argc; char **argv = context->argv; + static int quiet = 0; static int set_args = 0; static int inhibit_home_gdbinit = 0; @@ -325,15 +484,10 @@ captured_main (void *data) static int print_configuration; /* Pointers to all arguments of --command option. */ - VEC (cmdarg_s) *cmdarg_vec = NULL; - struct cmdarg *cmdarg_p; + std::vector 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 dirarg; /* gdb init files. */ const char *system_gdbinit; @@ -344,14 +498,14 @@ captured_main (void *data) int save_auto_load; struct objfile *objfile; - struct cleanup *pre_stat_chain; + struct cleanup *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, ""); @@ -359,27 +513,26 @@ captured_main (void *data) #if defined (HAVE_SETLOCALE) setlocale (LC_CTYPE, ""); #endif +#ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#endif bfd_init (); notice_open_fds (); + save_original_signals_state (); + + saved_command_line = (char *) xstrdup (""); + +#ifdef __MINGW32__ + /* Ensure stderr is unbuffered. A Cygwin pty or pipe is implemented + as a Windows pipe, and Windows buffers on pipes. */ + setvbuf (stderr, NULL, _IONBF, BUFSIZ); +#endif + + main_ui = new_ui (stdin, stdout, stderr); + current_ui = main_ui; - make_cleanup (VEC_cleanup (cmdarg_s), &cmdarg_vec); - dirsize = 1; - dirarg = (char **) xmalloc (dirsize * sizeof (*dirarg)); - ndir = 0; - - clear_quit_flag (); - saved_command_line = (char *) xmalloc (saved_command_line_size); - saved_command_line[0] = '\0'; - instream = stdin; - - gdb_stdout = stdio_fileopen (stdout); - gdb_stderr = stdio_fileopen (stderr); - gdb_stdlog = gdb_stderr; /* for moment */ - gdb_stdtarg = gdb_stderr; /* for moment */ - gdb_stdin = stdio_fileopen (stdin); gdb_stdtargerr = gdb_stderr; /* for moment */ gdb_stdtargin = gdb_stdin; /* for moment */ @@ -391,20 +544,26 @@ captured_main (void *data) gdb_program_name = xstrdup (argv[0]); #endif + /* Prefix warning messages with the command name. */ + gdb::unique_xmalloc_ptr tmp_warn_preprint + (xstrprintf ("%s: warning: ", gdb_program_name)); + warning_pre_print = tmp_warn_preprint.get (); + if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) - /* Don't use *_filtered or warning() (which relies on - current_target) until after initialize_all_files(). */ - fprintf_unfiltered (gdb_stderr, - _("%s: warning: error finding " - "working directory: %s\n"), - argv[0], safe_strerror (errno)); - + 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); + if (gdb_sysroot == NULL || *gdb_sysroot == '\0') + { + xfree (gdb_sysroot); + gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX); + } + debug_file_directory = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE); @@ -414,7 +573,7 @@ captured_main (void *data) #ifdef WITH_PYTHON_PATH { /* For later use in helping Python find itself. */ - char *tmp = concat (WITH_PYTHON_PATH, SLASH_STRING, "lib", NULL); + char *tmp = concat (WITH_PYTHON_PATH, SLASH_STRING, "lib", (char *) NULL); python_libdir = relocate_gdb_directory (tmp, PYTHON_PATH_RELOCATABLE); xfree (tmp); @@ -453,7 +612,6 @@ captured_main (void *data) static struct option long_options[] = { {"tui", no_argument, 0, OPT_TUI}, - {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, {"readnow", no_argument, &readnow_symbol_files, 1}, {"r", no_argument, &readnow_symbol_files, 1}, @@ -504,6 +662,7 @@ captured_main (void *data) {"directory", required_argument, 0, 'd'}, {"d", required_argument, 0, 'd'}, {"data-directory", required_argument, 0, 'D'}, + {"D", required_argument, 0, 'D'}, {"cd", required_argument, 0, OPT_CD}, {"tty", required_argument, 0, 't'}, {"baud", required_argument, 0, 'b'}, @@ -560,10 +719,7 @@ captured_main (void *data) xfree (interpreter_p); interpreter_p = xstrdup (INTERP_TUI); #else - fprintf_unfiltered (gdb_stderr, - _("%s: TUI mode is not supported\n"), - argv[0]); - exit (1); + error (_("%s: TUI mode is not supported"), gdb_program_name); #endif break; case OPT_WINDOWS: @@ -574,19 +730,14 @@ captured_main (void *data) xfree (interpreter_p); interpreter_p = xstrdup (INTERP_INSIGHT); #endif - use_windows = 1; break; case OPT_NOWINDOWS: /* -nw is equivalent to -i=console. */ xfree (interpreter_p); interpreter_p = xstrdup (INTERP_CONSOLE); - use_windows = 0; break; case 'f': annotation_level = 1; - /* We have probably been invoked from emacs. Disable - window interface. */ - use_windows = 0; break; case 's': symarg = optarg; @@ -601,40 +752,26 @@ captured_main (void *data) 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': - xfree (gdb_datadir); - gdb_datadir = xstrdup (optarg); + if (optarg[0] == '\0') + error (_("%s: empty path for `--data-directory'"), + gdb_program_name); + set_gdb_data_directory (optarg); gdb_datadir_provided = 1; break; #ifdef GDBTK @@ -643,13 +780,8 @@ captured_main (void *data) extern int gdbtk_test (char *); if (!gdbtk_test (optarg)) - { - fprintf_unfiltered (gdb_stderr, - _("%s: unable to load " - "tclcommand file \"%s\""), - argv[0], optarg); - exit (1); - } + error (_("%s: unable to load tclcommand file \"%s\""), + gdb_program_name, optarg); break; } case 'y': @@ -670,13 +802,7 @@ captured_main (void *data) 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; @@ -691,13 +817,8 @@ captured_main (void *data) i = strtol (optarg, &p, 0); if (i == 0 && p == optarg) - - /* Don't use *_filtered or warning() (which relies on - current_target) until after initialize_all_files(). */ - - fprintf_unfiltered - (gdb_stderr, - _("warning: could not set baud rate to `%s'.\n"), optarg); + warning (_("could not set baud rate to `%s'."), + optarg); else baud_rate = i; } @@ -709,40 +830,27 @@ captured_main (void *data) i = strtol (optarg, &p, 0); if (i == 0 && p == optarg) - - /* Don't use *_filtered or warning() (which relies on - current_target) until after initialize_all_files(). */ - - fprintf_unfiltered (gdb_stderr, - _("warning: could not set " - "timeout limit to `%s'.\n"), optarg); + warning (_("could not set timeout limit to `%s'."), + optarg); else remote_timeout = i; } break; case '?': - fprintf_unfiltered (gdb_stderr, - _("Use `%s --help' for a " - "complete list of options.\n"), - argv[0]); - exit (1); + error (_("Use `%s --help' for a complete list of options."), + gdb_program_name); } } - /* If --help or --version or --configuration, disable window - interface. */ - if (print_help || print_version || print_configuration) - { - use_windows = 0; - } - if (batch_flag) quiet = 1; } - /* Initialize all files. Give the interpreter a chance to take - control of the console via the deprecated_init_ui_hook (). */ + /* Try to set up an alternate signal stack for SIGSEGV handlers. */ + setup_alternate_signal_stack (); + + /* Initialize all files. */ gdb_init (gdb_program_name); /* Now that gdb_init has created the initial inferior, we're in @@ -753,13 +861,9 @@ captured_main (void *data) inferior. The first one is the sym/exec file, and the rest are arguments. */ if (optind >= argc) - { - fprintf_unfiltered (gdb_stderr, - _("%s: `--args' specified but " - "no program specified\n"), - argv[0]); - exit (1); - } + error (_("%s: `--args' specified but no program specified"), + gdb_program_name); + symarg = argv[optind]; execarg = argv[optind]; ++optind; @@ -850,22 +954,7 @@ captured_main (void *data) /* 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 (interpreter_p); - - if (interp == NULL) - error (_("Interpreter `%s' unrecognized"), interpreter_p); - /* Install it. */ - if (!interp_set (interp, 1)) - { - fprintf_unfiltered (gdb_stderr, - "Interpreter `%s' failed to initialize.\n", - interpreter_p); - exit (1); - } - } + 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 @@ -885,8 +974,7 @@ captured_main (void *data) } /* Set off error and warning messages with a blank line. */ - error_pre_print = "\n"; - quit_pre_print = error_pre_print; + tmp_warn_preprint.reset (); warning_pre_print = _("\nwarning: "); /* Read and execute the system-wide gdbinit file, if it exists. @@ -894,8 +982,7 @@ captured_main (void *data) 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, RETURN_MASK_ALL); + catch_command_errors_const (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 @@ -903,32 +990,34 @@ captured_main (void *data) debugging or what directory you are in. */ if (home_gdbinit && !inhibit_gdbinit && !inhibit_home_gdbinit) - catch_command_errors_const (source_script, - home_gdbinit, 0, RETURN_MASK_ALL); + catch_command_errors_const (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, RETURN_MASK_ALL); - break; - case CMDARG_INIT_COMMAND: - catch_command_errors (execute_command, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); - break; + const struct cmdarg &cmdarg_p = cmdarg_vec[i]; + + switch (cmdarg_p.type) + { + 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; + } } /* Now perform all the actions indicated by the arguments. */ if (cdarg != NULL) { - catch_command_errors (cd_command, cdarg, 0, RETURN_MASK_ALL); + catch_command_errors (cd_command, cdarg, 0); } - for (i = 0; i < ndir; i++) - catch_command_errors (directory_switch, dirarg[i], 0, RETURN_MASK_ALL); - xfree (dirarg); + for (i = 0; i < dirarg.size (); i++) + catch_command_errors (directory_switch, dirarg[i], 0); /* Skip auto-loading section-specified scripts until we've sourced local_gdbinit (which is often used to augment the source search @@ -943,19 +1032,19 @@ captured_main (void *data) /* 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 (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL)) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + if (catch_command_errors_const (exec_file_attach, execarg, + !batch_flag)) + catch_command_errors_const (symbol_file_add_main_adapter, symarg, + !batch_flag); } else { if (execarg != NULL) - catch_command_errors (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (exec_file_attach, execarg, + !batch_flag); if (symarg != NULL) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (symbol_file_add_main_adapter, symarg, + !batch_flag); } if (corearg && pidarg) @@ -963,11 +1052,9 @@ captured_main (void *data) "a core file at the same time.")); if (corearg != NULL) - catch_command_errors (core_file_command, corearg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors (core_file_command, corearg, !batch_flag); else if (pidarg != NULL) - catch_command_errors (attach_command, pidarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors (attach_command, pidarg, !batch_flag); else if (pid_or_core_arg) { /* The user specified 'gdb program pid' or gdb program core'. @@ -977,21 +1064,19 @@ captured_main (void *data) if (isdigit (pid_or_core_arg[0])) { if (catch_command_errors (attach_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL) == 0) + !batch_flag) == 0) catch_command_errors (core_file_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); } else /* Can't be a pid, better be a corefile. */ catch_command_errors (core_file_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); } if (ttyarg != NULL) set_inferior_io_terminal (ttyarg); /* Error messages should no longer be distinguished with extra output. */ - error_pre_print = NULL; - quit_pre_print = NULL; warning_pre_print = _("warning: "); /* Read the .gdbinit file in the current directory, *if* it isn't @@ -1008,8 +1093,7 @@ captured_main (void *data) { auto_load_local_gdbinit_loaded = 1; - catch_command_errors_const (source_script, local_gdbinit, 0, - RETURN_MASK_ALL); + catch_command_errors_const (source_script, local_gdbinit, 0); } } @@ -1022,17 +1106,21 @@ captured_main (void *data) 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, RETURN_MASK_ALL); - break; - case CMDARG_COMMAND: - catch_command_errors (execute_command, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); - break; + const struct cmdarg &cmdarg_p = cmdarg_vec[i]; + + switch (cmdarg_p.type) + { + 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; + } } /* Read in the old history after all the command files have been @@ -1044,9 +1132,14 @@ captured_main (void *data) /* 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() @@ -1062,8 +1155,16 @@ captured_main (void *data) int gdb_main (struct captured_main_args *args) { - use_windows = args->use_windows; - catch_errors (captured_main, args, "", RETURN_MASK_ALL); + TRY + { + captured_main (args); + } + CATCH (ex, RETURN_MASK_ALL) + { + exception_print (gdb_stderr, ex); + } + END_CATCH + /* The only way to end up here is by an error (normal exit is handled by quit_force()), hence always return an error status. */ return 1; @@ -1133,8 +1234,8 @@ Output and user interface control:\n\n\ #endif fputs_unfiltered (_("\ --dbx DBX compatibility mode.\n\ - --xdb XDB compatibility mode.\n\ - --quiet Do not print version number on startup.\n\n\ + -q, --quiet, --silent\n\ + Do not print version number on startup.\n\n\ "), stream); fputs_unfiltered (_("\ Operating modes:\n\n\ @@ -1150,6 +1251,8 @@ Remote debugging options:\n\n\ -l TIMEOUT Set timeout in seconds for remote debugging.\n\n\ Other options:\n\n\ --cd=DIR Change current directory to DIR.\n\ + --data-directory=DIR, -D\n\ + Set GDB's data-directory to DIR.\n\ "), stream); fputs_unfiltered (_("\n\ At startup, GDB reads the following init files and executes their commands:\n\