X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmain.c;h=540738e543d5e0b77126a7d2bd04ce2b72ae0254;hb=268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc;hp=12f0146e3b95f55ebbb445c8dfd5349453eb8471;hpb=075c703382f5bed4ec0976dd11f3b5b694ce3cb1;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/main.c b/gdb/main.c index 12f0146e3b..540738e543 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1,6 +1,6 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -23,8 +23,6 @@ #include "inferior.h" #include "symfile.h" #include "gdbcore.h" - -#include "exceptions.h" #include "getopt.h" #include @@ -42,18 +40,20 @@ #include "maint.h" #include "filenames.h" -#include "filestuff.h" +#include "gdbsupport/filestuff.h" #include #include "event-top.h" +#include "infrun.h" +#include "gdbsupport/signals-state-save-restore.h" +#include +#include "gdbsupport/pathstuff.h" +#include "cli/cli-style.h" /* 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; @@ -72,10 +72,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; @@ -126,7 +122,7 @@ set_gdb_data_directory (const char *new_datadir) 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 @@ -134,10 +130,10 @@ set_gdb_data_directory (const char *new_datadir) isn't canonical, but that's ok. */ if (!IS_ABSOLUTE_PATH (gdb_datadir)) { - char *abs_datadir = gdb_abspath (gdb_datadir); + gdb::unique_xmalloc_ptr abs_datadir = gdb_abspath (gdb_datadir); xfree (gdb_datadir); - gdb_datadir = abs_datadir; + gdb_datadir = abs_datadir.release (); } } @@ -213,7 +209,7 @@ get_init_files (const char **system_gdbinit, if (!initialized) { struct stat homebuf, cwdbuf, s; - char *homedir; + const char *homedir; if (SYSTEM_GDBINIT[0]) { @@ -230,13 +226,13 @@ get_init_files (const char **system_gdbinit, { /* 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) continue; relocated_sysgdbinit = concat (gdb_datadir, SLASH_STRING, p, - NULL); + (char *) NULL); xfree (tmp_sys_gdbinit); } else @@ -301,7 +297,9 @@ setup_alternate_signal_stack (void) #ifdef HAVE_SIGALTSTACK stack_t ss; - ss.ss_sp = xmalloc (SIGSTKSZ); + /* 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; @@ -309,38 +307,39 @@ setup_alternate_signal_stack (void) #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; + /* Top-level execution commands can be run in the background from here on. */ - interpreter_async = 1; - - 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 - the do_cleanups() below is redundant. Unfortunately, many FUNCs - are not that well behaved. do_cleanups should either be replaced - with a do_cleanups call (to cover the problem) or an assertion - check to detect bad FUNCs code. */ - do_cleanups (all_cleanups ()); + 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 (); + /* 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, 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 (volatile struct gdb_exception e) +handle_command_errors (const struct gdb_exception &e) { if (e.reason < 0) { @@ -355,75 +354,97 @@ handle_command_errors (volatile 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, return_mask mask) +catch_command_errors (catch_command_errors_const_ftype command, + const char *arg, int from_tty) { - volatile struct gdb_exception e; - - TRY_CATCH (e, mask) + try { + int was_sync = current_ui->prompt_state == PROMPT_BLOCKED; + command (arg, from_tty); + + maybe_wait_sync_command_done (was_sync); } - return handle_command_errors (e); + catch (const gdb_exception &e) + { + return handle_command_errors (e); + } + + 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); +static void +symbol_file_add_main_adapter (const char *arg, int from_tty) +{ + symfile_add_flags add_flags = 0; -/* Like catch_command_errors, but works with const command and args. */ + if (from_tty) + add_flags |= SYMFILE_VERBOSE; -static int -catch_command_errors_const (catch_command_errors_const_ftype *command, - const char *arg, int from_tty, return_mask mask) -{ - volatile struct gdb_exception e; + symbol_file_add_main (arg, add_flags); +} - TRY_CATCH (e, mask) +/* Perform validation of the '--readnow' and '--readnever' flags. */ + +static void +validate_readnow_readnever () +{ + if (readnever_symbol_files && readnow_symbol_files) { - command (arg, from_tty); + error (_("%s: '--readnow' and '--readnever' cannot be " + "specified simultaneously"), + gdb_program_name); } - return handle_command_errors (e); } -/* Arguments of --command option and its counterpart. */ -typedef struct cmdarg { - /* Type of this option. */ - enum { - /* Option type -x. */ - CMDARG_FILE, +/* Type of this option. */ +enum cmdarg_kind +{ + /* Option type -x. */ + CMDARG_FILE, - /* Option type -ex. */ - CMDARG_COMMAND, + /* Option type -ex. */ + CMDARG_COMMAND, - /* Option type -ix. */ - CMDARG_INIT_FILE, + /* 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; @@ -444,15 +465,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; @@ -461,16 +477,14 @@ captured_main (void *data) int i; int save_auto_load; - struct objfile *objfile; + int ret = 1; - struct cleanup *pre_stat_chain; - -#ifdef HAVE_SBRK - /* Set this before calling make_command_stats_cleanup. */ +#ifdef HAVE_USEFUL_SBRK + /* 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, ""); @@ -478,37 +492,30 @@ 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 (); - 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; - #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 - gdb_stdout = stdio_fileopen (stdout); - gdb_stderr = stderr_fileopen (); + /* Note: `error' cannot be called before this point, because the + caller will crash when trying to print the exception. */ + main_ui = new ui (stdin, stdout, stderr); + current_ui = main_ui; - 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 */ + if (bfd_init () != BFD_INIT_MAGIC) + error (_("fatal error: libbfd ABI mismatch")); + #ifdef __MINGW32__ /* On Windows, argv[0] is not necessarily set to absolute form when GDB is found along PATH, without which relocation doesn't work. */ @@ -518,17 +525,24 @@ captured_main (void *data) #endif /* Prefix warning messages with the command name. */ - warning_pre_print = xstrprintf ("%s: warning: ", gdb_program_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))) + 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); + 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); @@ -538,7 +552,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); @@ -572,15 +586,17 @@ captured_main (void *data) OPT_NOWINDOWS, OPT_WINDOWS, OPT_IX, - OPT_IEX + OPT_IEX, + OPT_READNOW, + OPT_READNEVER }; 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}, + {"readnow", no_argument, NULL, OPT_READNOW}, + {"readnever", no_argument, NULL, OPT_READNEVER}, + {"r", no_argument, NULL, OPT_READNOW}, {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, {"silent", no_argument, &quiet, 1}, @@ -718,36 +734,20 @@ 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': if (optarg[0] == '\0') @@ -784,13 +784,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; @@ -800,28 +794,42 @@ captured_main (void *data) break; case 'b': { - int i; + int rate; char *p; - i = strtol (optarg, &p, 0); - if (i == 0 && p == optarg) + rate = strtol (optarg, &p, 0); + if (rate == 0 && p == optarg) warning (_("could not set baud rate to `%s'."), optarg); else - baud_rate = i; + baud_rate = rate; } break; case 'l': { - int i; + int timeout; char *p; - i = strtol (optarg, &p, 0); - if (i == 0 && p == optarg) + timeout = strtol (optarg, &p, 0); + if (timeout == 0 && p == optarg) warning (_("could not set timeout limit to `%s'."), optarg); else - remote_timeout = i; + remote_timeout = timeout; + } + break; + + case OPT_READNOW: + { + readnow_symbol_files = 1; + validate_readnow_readnever (); + } + break; + + case OPT_READNEVER: + { + readnever_symbol_files = 1; + validate_readnow_readnever (); } break; @@ -832,14 +840,20 @@ captured_main (void *data) } if (batch_flag) - quiet = 1; + { + quiet = 1; + + /* Disable all output styling when running in batch mode. */ + cli_styling = 0; + } } + save_original_signals_state (quiet); + /* Try to set up an alternate signal stack for SIGSEGV handlers. */ setup_alternate_signal_stack (); - /* Initialize all files. Give the interpreter a chance to take - control of the console via the deprecated_init_ui_hook (). */ + /* Initialize all files. */ gdb_init (gdb_program_name); /* Now that gdb_init has created the initial inferior, we're in @@ -903,7 +917,7 @@ captured_main (void *data) if (print_version) { - print_gdb_version (gdb_stdout); + print_gdb_version (gdb_stdout, false); wrap_here (""); printf_filtered ("\n"); exit (0); @@ -932,7 +946,7 @@ captured_main (void *data) { /* Print all the junk at the top, with trailing "..." if we are about to read a symbol file (possibly slowly). */ - print_gdb_version (gdb_stdout); + print_gdb_version (gdb_stdout, true); if (symarg) printf_filtered (".."); wrap_here (""); @@ -943,17 +957,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)) - 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 @@ -963,7 +967,7 @@ captured_main (void *data) { /* Print all the junk at the top, with trailing "..." if we are about to read a symbol file (possibly slowly). */ - print_gdb_version (gdb_stdout); + print_gdb_version (gdb_stdout, true); if (symarg) printf_filtered (".."); wrap_here (""); @@ -973,7 +977,7 @@ captured_main (void *data) } /* 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. @@ -981,8 +985,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); + ret = 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 @@ -990,32 +993,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); + ret = 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, 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: + ret = catch_command_errors (source_script, cmdarg_p.string, + !batch_flag); + break; + case CMDARG_INIT_COMMAND: + ret = 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); + ret = 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++) + ret = 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 @@ -1030,19 +1035,20 @@ 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_const (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL)) - catch_command_errors_const (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + ret = catch_command_errors (exec_file_attach, execarg, + !batch_flag); + if (ret != 0) + ret = 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, RETURN_MASK_ALL); + ret = catch_command_errors (exec_file_attach, execarg, + !batch_flag); if (symarg != NULL) - catch_command_errors_const (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + ret = catch_command_errors (symbol_file_add_main_adapter, + symarg, !batch_flag); } if (corearg && pidarg) @@ -1050,11 +1056,14 @@ 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); + { + ret = catch_command_errors (core_file_command, corearg, + !batch_flag); + } else if (pidarg != NULL) - catch_command_errors (attach_command, pidarg, - !batch_flag, RETURN_MASK_ALL); + { + ret = catch_command_errors (attach_command, pidarg, !batch_flag); + } else if (pid_or_core_arg) { /* The user specified 'gdb program pid' or gdb program core'. @@ -1063,14 +1072,20 @@ 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) - catch_command_errors (core_file_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL); + ret = catch_command_errors (attach_command, pid_or_core_arg, + !batch_flag); + if (ret == 0) + ret = catch_command_errors (core_file_command, + pid_or_core_arg, + !batch_flag); + } + else + { + /* Can't be a pid, better be a corefile. */ + ret = catch_command_errors (core_file_command, + pid_or_core_arg, + !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); } if (ttyarg != NULL) @@ -1083,7 +1098,8 @@ captured_main (void *data) 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, @@ -1093,8 +1109,7 @@ captured_main (void *data) { auto_load_local_gdbinit_loaded = 1; - catch_command_errors_const (source_script, local_gdbinit, 0, - RETURN_MASK_ALL); + ret = catch_command_errors (source_script, local_gdbinit, 0); } } @@ -1103,21 +1118,25 @@ captured_main (void *data) We wait until now because it is common to add to the source search path in local_gdbinit. */ global_auto_load = save_auto_load; - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) 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: + ret = catch_command_errors (source_script, cmdarg_p.string, + !batch_flag); + break; + case CMDARG_COMMAND: + ret = catch_command_errors (execute_command, cmdarg_p.string, + !batch_flag); + break; + } } /* Read in the old history after all the command files have been @@ -1126,12 +1145,20 @@ captured_main (void *data) if (batch_flag) { + int error_status = EXIT_FAILURE; + int *exit_arg = ret == 0 ? &error_status : NULL; + /* We have hit the end of the batch file. */ - quit_force (NULL, 0); + quit_force (exit_arg, 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() @@ -1139,7 +1166,14 @@ captured_main (void *data) change - SET_TOP_LEVEL() - has been eliminated. */ while (1) { - catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL); + try + { + captured_command_loop (); + } + catch (const gdb_exception &ex) + { + exception_print (gdb_stderr, ex); + } } /* No exit -- exit is through quit_command. */ } @@ -1147,7 +1181,15 @@ captured_main (void *data) int gdb_main (struct captured_main_args *args) { - catch_errors (captured_main, args, "", RETURN_MASK_ALL); + try + { + captured_main (args); + } + catch (const gdb_exception &ex) + { + exception_print (gdb_stderr, ex); + } + /* 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; @@ -1185,6 +1227,7 @@ Selection of debuggee and its files:\n\n\ --se=FILE Use FILE as symbol file and executable file.\n\ --symbols=SYMFILE Read symbols from SYMFILE.\n\ --readnow Fully read symbol files on first access.\n\ + --readnever Do not read symbol files.\n\ --write Set writing into executable and core files.\n\n\ "), stream); fputs_unfiltered (_("\ @@ -1217,7 +1260,6 @@ Output and user interface control:\n\n\ #endif fputs_unfiltered (_("\ --dbx DBX compatibility mode.\n\ - --xdb XDB compatibility mode.\n\ -q, --quiet, --silent\n\ Do not print version number on startup.\n\n\ "), stream);