Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
- 2009, 2010 Free Software Foundation, Inc.
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GDB.
#include "source.h"
#include "cli/cli-cmds.h"
#include "python/python.h"
-
-/* If nonzero, display time usage both at startup and for each command. */
-
-int display_time;
-
-/* If nonzero, display space usage both at startup and for each command. */
-
-int display_space;
+#include "objfiles.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. */
+ do_setshow_command will free it. */
char *interpreter_p;
-/* Whether xdb commands will be handled */
+/* Whether xdb commands will be handled. */
int xdb_commands = 0;
-/* Whether dbx commands will be handled */
+/* Whether dbx commands will be handled. */
int dbx_commands = 0;
/* System root path, used to find libraries etc. */
/* GDB datadir, used to store data files. */
char *gdb_datadir = 0;
+/* If gdb was configured with --with-python=/path,
+ 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 */
+/* Target IO streams. */
struct ui_file *gdb_stdtargin;
struct ui_file *gdb_stdtarg;
struct ui_file *gdb_stdtargerr;
int return_child_result = 0;
int return_child_result_value = -1;
-/* Whether to enable writing into executable and core files */
+/* Whether to enable writing into executable and core files. */
extern int write_files;
/* GDB as it has been invoked from the command line (i.e. argv[0]). */
static void print_gdb_help (struct ui_file *);
-/* These two are used to set the external editor commands when gdb is farming
- out files to be edited by another program. */
+/* These two are used to set the external editor commands when gdb is
+ farming out files to be edited by another program. */
extern char *external_editor_command;
file or directory. FLAG is true if the value is relocatable, false
otherwise. Returns a newly allocated string; this may return NULL
under the same conditions as make_relative_prefix. */
+
static char *
relocate_path (const char *progname, const char *initial, int flag)
{
the result is a directory, it is used; otherwise, INITIAL is used.
The chosen directory is then canonicalized using lrealpath. This
function always returns a newly-allocated string. */
-static char *
-relocate_directory (const char *progname, const char *initial, int flag)
+
+char *
+relocate_gdb_directory (const char *initial, int flag)
{
char *dir;
- dir = relocate_path (progname, initial, flag);
+ dir = relocate_path (gdb_program_name, initial, flag);
if (dir)
{
struct stat s;
if (*dir)
{
char *canon_sysroot = lrealpath (dir);
+
if (canon_sysroot)
{
xfree (dir);
return dir;
}
-/* Compute the locations of init files that GDB should source and return
- them in SYSTEM_GDBINIT, HOME_GDBINIT, LOCAL_GDBINIT. If there is
- no system gdbinit (resp. home gdbinit and local gdbinit) to be loaded,
- then SYSTEM_GDBINIT (resp. HOME_GDBINIT and LOCAL_GDBINIT) is set to
- NULL. */
+/* Compute the locations of init files that GDB should source and
+ return them in SYSTEM_GDBINIT, HOME_GDBINIT, LOCAL_GDBINIT. If
+ there is no system gdbinit (resp. home gdbinit and local gdbinit)
+ to be loaded, then SYSTEM_GDBINIT (resp. HOME_GDBINIT and
+ LOCAL_GDBINIT) is set to NULL. */
static void
get_init_files (char **system_gdbinit,
char **home_gdbinit,
/* If the .gdbinit file in the current directory is the same as
the $HOME/.gdbinit file, it should not be sourced. homebuf
- and cwdbuf are used in that purpose. Make sure that the stats
+ and cwdbuf are used in that purpose. Make sure that the stats
are zero in case one of them fails (this guarantees that they
won't match if either exists). */
}
/* Call command_loop. If it happens to return, pass that through as a
- non-zero return status. */
+ non-zero return status. */
static int
captured_command_loop (void *data)
{
+ /* Top-level execution commands can be run on 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
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. */
+ 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()
+ error) we try to quit. If the quit is aborted, catch_errors()
which called this catch the signal and restart the command
- loop. */
+ loop. */
quit_command (NULL, instream == stdin);
return 1;
}
char *cdarg = NULL;
char *ttyarg = NULL;
- /* These are static so that we can take their address in an initializer. */
+ /* These are static so that we can take their address in an
+ initializer. */
static int print_help;
static int print_version;
int i;
int save_auto_load;
+ struct objfile *objfile;
+
+ struct cleanup *pre_stat_chain;
- long time_at_startup = get_run_time ();
+#ifdef HAVE_SBRK
+ /* Set this before calling make_command_stats_cleanup. */
+ lim_at_start = (char *) sbrk (0);
+#endif
+
+ pre_stat_chain = make_command_stats_cleanup (0);
#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
setlocale (LC_MESSAGES, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
-#ifdef HAVE_SBRK
- lim_at_start = (char *) sbrk (0);
-#endif
-
cmdsize = 1;
cmdarg = (struct cmdarg *) xmalloc (cmdsize * sizeof (*cmdarg));
ncmd = 0;
ndir = 0;
quit_flag = 0;
- line = (char *) xmalloc (linesize);
- line[0] = '\0'; /* Terminate saved (now empty) cmd line */
+ saved_command_line = (char *) xmalloc (saved_command_line_size);
+ saved_command_line[0] = '\0';
instream = stdin;
gdb_stdout = stdio_fileopen (stdout);
if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
/* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
+ current_target) until after initialize_all_files(). */
fprintf_unfiltered (gdb_stderr,
- _("%s: warning: error finding working directory: %s\n"),
+ _("%s: warning: error finding "
+ "working directory: %s\n"),
argv[0], safe_strerror (errno));
current_directory = gdb_dirbuf;
/* Set the sysroot path. */
- gdb_sysroot = relocate_directory (argv[0], TARGET_SYSTEM_ROOT,
- TARGET_SYSTEM_ROOT_RELOCATABLE);
+ gdb_sysroot = relocate_gdb_directory (TARGET_SYSTEM_ROOT,
+ TARGET_SYSTEM_ROOT_RELOCATABLE);
- debug_file_directory = relocate_directory (argv[0], DEBUGDIR,
- DEBUGDIR_RELOCATABLE);
+ debug_file_directory = relocate_gdb_directory (DEBUGDIR,
+ DEBUGDIR_RELOCATABLE);
- gdb_datadir = relocate_directory (argv[0], GDB_DATADIR,
- GDB_DATADIR_RELOCATABLE);
+ gdb_datadir = relocate_gdb_directory (GDB_DATADIR,
+ GDB_DATADIR_RELOCATABLE);
+
+#ifdef WITH_PYTHON_PATH
+ {
+ /* For later use in helping Python find itself. */
+ char *tmp = concat (WITH_PYTHON_PATH, SLASH_STRING, "lib", NULL);
+
+ python_libdir = relocate_gdb_directory (tmp, PYTHON_PATH_RELOCATABLE);
+ xfree (tmp);
+ }
+#endif
#ifdef RELOC_SRCDIR
add_substitute_path_rule (RELOC_SRCDIR,
{"batch", no_argument, &batch_flag, 1},
{"epoch", no_argument, &epoch_interface, 1},
- /* This is a synonym for "--annotate=1". --annotate is now preferred,
- but keep this here for a long time because people will be running
- emacses which use --fullname. */
+ /* This is a synonym for "--annotate=1". --annotate is now
+ preferred, but keep this here for a long time because people
+ will be running emacses which use --fullname. */
{"fullname", no_argument, 0, 'f'},
{"f", no_argument, 0, 'f'},
{"i", required_argument, 0, 'i'},
{"directory", required_argument, 0, 'd'},
{"d", required_argument, 0, 'd'},
+ {"data-directory", required_argument, 0, 'D'},
{"cd", required_argument, 0, OPT_CD},
{"tty", required_argument, 0, 't'},
{"baud", required_argument, 0, 'b'},
break;
case OPT_STATISTICS:
/* Enable the display of both time and space usage. */
- display_time = 1;
- display_space = 1;
+ set_display_time (1);
+ set_display_space (1);
break;
case OPT_TUI:
/* --tui is equivalent to -i=tui. */
break;
case 'f':
annotation_level = 1;
-/* We have probably been invoked from emacs. Disable window interface. */
+ /* We have probably been invoked from emacs. Disable
+ window interface. */
use_windows = 0;
break;
case 's':
batch_flag = batch_silent = 1;
gdb_stdout = ui_file_new();
break;
+ case 'D':
+ xfree (gdb_datadir);
+ gdb_datadir = xstrdup (optarg);
+ break;
#ifdef GDBTK
case 'z':
{
-extern int gdbtk_test (char *);
+ extern int gdbtk_test (char *);
+
if (!gdbtk_test (optarg))
{
- fprintf_unfiltered (gdb_stderr, _("%s: unable to load tclcommand file \"%s\""),
+ fprintf_unfiltered (gdb_stderr,
+ _("%s: unable to load "
+ "tclcommand file \"%s\""),
argv[0], optarg);
exit (1);
}
if (i == 0 && p == optarg)
/* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
+ current_target) until after initialize_all_files(). */
fprintf_unfiltered
(gdb_stderr,
if (i == 0 && p == optarg)
/* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
+ current_target) until after initialize_all_files(). */
- fprintf_unfiltered
- (gdb_stderr,
- _("warning: could not set timeout limit to `%s'.\n"), optarg);
+ fprintf_unfiltered (gdb_stderr,
+ _("warning: could not set "
+ "timeout limit to `%s'.\n"), optarg);
else
remote_timeout = i;
}
case '?':
fprintf_unfiltered (gdb_stderr,
- _("Use `%s --help' for a complete list of options.\n"),
+ _("Use `%s --help' for a "
+ "complete list of options.\n"),
argv[0]);
exit (1);
}
control of the console via the deprecated_init_ui_hook (). */
gdb_init (argv[0]);
- /* Now that gdb_init has created the initial inferior, we're in position
- to set args for that inferior. */
+ /* Now that gdb_init has created the initial inferior, we're in
+ position to set args for that inferior. */
if (set_args)
{
/* The remaining options are the command-line options for the
if (optind >= argc)
{
fprintf_unfiltered (gdb_stderr,
- _("%s: `--args' specified but no program specified\n"),
+ _("%s: `--args' specified but "
+ "no program specified\n"),
argv[0]);
exit (1);
}
/* Any argument left on the command line is unexpected and
will be ignored. Inform the user. */
if (optind < argc)
- fprintf_unfiltered (gdb_stderr, _("\
-Excess command line arguments ignored. (%s%s)\n"),
+ fprintf_unfiltered (gdb_stderr,
+ _("Excess command line "
+ "arguments ignored. (%s%s)\n"),
argv[optind],
(optind == argc - 1) ? "" : " ...");
}
- /* Lookup gdbinit files. Note that the gdbinit file name may be overriden
- during file initialization, so get_init_files should be called after
- gdb_init. */
+ /* Lookup gdbinit files. Note that the gdbinit file name may be
+ overriden during file initialization, so get_init_files should be
+ called after gdb_init. */
get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
/* Do these (and anything which might call wrap_here or *_filtered)
it isn't encapsulated in MI output. */
if (!quiet && strcmp (interpreter_p, INTERP_MI1) == 0)
{
- /* Print all the junk at the top, with trailing "..." if we are about
- to read a symbol file (possibly slowly). */
+ /* 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);
if (symarg)
printf_filtered ("..");
wrap_here ("");
printf_filtered ("\n");
- gdb_flush (gdb_stdout); /* Force to screen during slow operations */
+ gdb_flush (gdb_stdout); /* Force to screen during slow
+ operations. */
}
-
/* Install the default UI. All the interpreters should have had a
- look at things by now. Initialize the default interpreter. */
+ 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. */
any sane interpreter. */
if (!quiet && !current_interp_named_p (INTERP_MI1))
{
- /* Print all the junk at the top, with trailing "..." if we are about
- to read a symbol file (possibly slowly). */
+ /* 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);
if (symarg)
printf_filtered ("..");
wrap_here ("");
printf_filtered ("\n");
- gdb_flush (gdb_stdout); /* Force to screen during slow operations */
+ gdb_flush (gdb_stdout); /* Force to screen during slow
+ operations. */
}
/* Set off error and warning messages with a blank line. */
xfree (dirarg);
/* Skip auto-loading section-specified scripts until we've sourced
- local_gdbinit (which is often used to augment the source search path). */
+ local_gdbinit (which is often used to augment the source search
+ path). */
save_auto_load = gdbpy_global_auto_load;
gdbpy_global_auto_load = 0;
{
/* 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);
+ 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);
}
else
{
if (execarg != NULL)
- catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL);
+ catch_command_errors (exec_file_attach, execarg,
+ !batch_flag, RETURN_MASK_ALL);
if (symarg != NULL)
- catch_command_errors (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL);
+ catch_command_errors (symbol_file_add_main, symarg,
+ !batch_flag, RETURN_MASK_ALL);
}
if (corearg && pidarg)
- error (_("\
-Can't attach to process and specify a core file at the same time."));
+ error (_("Can't attach to process and specify "
+ "a core file at the same time."));
if (corearg != NULL)
catch_command_errors (core_file_command, corearg,
if (ttyarg != NULL)
set_inferior_io_terminal (ttyarg);
- /* Error messages should no longer be distinguished with extra output. */
+ /* Error messages should no longer be distinguished with extra output. */
error_pre_print = NULL;
quit_pre_print = NULL;
warning_pre_print = _("warning: ");
We wait until now because it is common to add to the source search
path in local_gdbinit. */
gdbpy_global_auto_load = save_auto_load;
- if (symfile_objfile != NULL)
- load_auto_scripts_for_objfile (symfile_objfile);
+ ALL_OBJFILES (objfile)
+ load_auto_scripts_for_objfile (objfile);
for (i = 0; i < ncmd; i++)
{
}
xfree (cmdarg);
- /* Read in the old history after all the command files have been read. */
+ /* Read in the old history after all the command files have been
+ read. */
init_history ();
if (batch_flag)
}
/* Show time and/or space usage. */
-
- if (display_time)
- {
- long init_time = get_run_time () - time_at_startup;
-
- printf_unfiltered (_("Startup time: %ld.%06ld\n"),
- init_time / 1000000, init_time % 1000000);
- }
-
- if (display_space)
- {
-#ifdef HAVE_SBRK
- extern char **environ;
- char *lim = (char *) sbrk (0);
-
- printf_unfiltered (_("Startup size: data size %ld\n"),
- (long) (lim - (char *) &environ));
-#endif
- }
+ do_cleanups (pre_stat_chain);
/* NOTE: cagney/1999-11-07: There is probably no reason for not
moving this loop and the code found in captured_command_loop()
into the command_loop() proper. The main thing holding back that
- change - SET_TOP_LEVEL() - has been eliminated. */
+ change - SET_TOP_LEVEL() - has been eliminated. */
while (1)
{
catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
projects / deliverable / binutils-gdb.git / blobdiff