gdb/top.c - Issue 124383005: GDB 7.6.50

Unified Diff: gdb/top.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gdb/top.c

diff --git a/gdb/top.c b/gdb/top.c

index 061ad48f41e756cc22032490543f7a77037e8d10..8ce1a9fd383aaf95e687460129d9d1eb513ef37e 100644

--- a/gdb/top.c

+++ b/gdb/top.c

@@ -1,6 +1,6 @@

/* Top level stuff for GDB, the GNU debugger.

This file is part of GDB.

@@ -19,7 +19,6 @@

#include "defs.h"

#include "gdbcmd.h"

-#include "call-cmds.h"

#include "cli/cli-cmds.h"

#include "cli/cli-script.h"

#include "cli/cli-setshow.h"

@@ -29,6 +28,7 @@

#include "exceptions.h"

#include <signal.h>

#include "target.h"

+#include "target-dcache.h"

#include "breakpoint.h"

#include "gdbtypes.h"

#include "expression.h"

@@ -48,6 +48,8 @@

#include "python/python.h"

#include "interps.h"

#include "observer.h"

+#include "maint.h"

+#include "filenames.h"

/* readline include files. */

#include "readline/readline.h"

@@ -59,11 +61,14 @@

#include <sys/types.h>

#include "event-top.h"

-#include "gdb_string.h"

-#include "gdb_stat.h"

+#include <string.h>

+#include <sys/stat.h>

#include <ctype.h>

#include "ui-out.h"

#include "cli-out.h"

+#include "tracepoint.h"

+extern void initialize_all_files (void);

#define PROMPT(X) the_prompts.prompt_stack[the_prompts.top + X].prompt

#define PREFIX(X) the_prompts.prompt_stack[the_prompts.top + X].prefix

@@ -75,20 +80,9 @@

#define DEFAULT_PROMPT "(gdb) "

#endif

-/* Initialization file name for gdb. This is overridden in some configs. */

-#ifndef PATH_MAX

-# ifdef FILENAME_MAX

-# define PATH_MAX FILENAME_MAX

-# else

-# define PATH_MAX 512

-# endif

-#endif

+/* Initialization file name for gdb. This is host-dependent. */

-#ifndef GDBINIT_FILENAME

-#define GDBINIT_FILENAME ".gdbinit"

-#endif

-char gdbinit[PATH_MAX + 1] = GDBINIT_FILENAME;

+const char gdbinit[] = GDBINIT;

int inhibit_gdbinit = 0;

@@ -137,9 +131,6 @@ char gdb_dirbuf[1024];

void (*window_hook) (FILE *, char *);

-int epoch_interface;

-int xgdb_verbose;

/* Buffer used for reading command lines, and the size

allocated for it so far. */

@@ -154,13 +145,6 @@ int saved_command_line_size = 100;

is issuing commands too. */

int server_command;

-/* Baud rate specified for talking to serial target systems. Default

- is left as -1, so targets can choose their own defaults. */

-/* FIXME: This means that "show remotebaud" and gr_files_info can

- print -1 or (unsigned int)-1. This is a Bad User Interface. */

-int baud_rate = -1;

/* Timeout limit for response from target. */

/* The default value has been changed many times over the years. It

@@ -209,11 +193,6 @@ void (*deprecated_init_ui_hook) (char *argv0);

int (*deprecated_ui_loop_hook) (int);

-/* Called instead of command_loop at top level. Can be invoked via

- throw_exception(). */

-void (*deprecated_command_loop_hook) (void);

/* Called from print_frame_info to list the line we stopped in. */

@@ -336,7 +315,7 @@ read_command_file (FILE *stream)

void (*pre_init_ui_hook) (void);

#ifdef __MSDOS__

-void

+static void

do_chdir_cleanup (void *old_dir)

{

chdir (old_dir);

@@ -425,6 +404,7 @@ execute_command (char *p, int from_tty)

if (p == NULL)

{

do_cleanups (cleanup);

+ discard_cleanups (cleanup_if_error);

return;

}

@@ -434,13 +414,15 @@ execute_command (char *p, int from_tty)

p++;

if (*p)

{

+ const char *cmd = p;

char *arg;

line = p;

/* If trace-commands is set then this will print this command. */

print_command_trace (p);

- c = lookup_cmd (&p, cmdlist, "", 0, 1);

+ c = lookup_cmd (&cmd, cmdlist, "", 0, 1);

+ p = (char *) cmd;

/* Pass null arg rather than an empty one. */

arg = *p ? p : 0;

@@ -469,13 +451,15 @@ execute_command (char *p, int from_tty)

execute_cmd_pre_hook (c);

if (c->flags & DEPRECATED_WARN_USER)

- deprecated_cmd_warning (&line);

+ deprecated_cmd_warning (line);

/* c->user_commands would be NULL in the case of a python command. */

if (c->class == class_user && c->user_commands)

execute_user_command (c, arg);

- else if (c->type == set_cmd || c->type == show_cmd)

- do_setshow_command (arg, from_tty, c);

+ else if (c->type == set_cmd)

+ do_set_command (arg, from_tty, c);

+ else if (c->type == show_cmd)

+ do_show_command (arg, from_tty, c);

else if (!cmd_func_p (c))

error (_("That is not a command, just a help topic."));

else if (deprecated_call_command_hook)

@@ -567,7 +551,7 @@ command_loop (void)

if (window_hook && instream == stdin)

(*window_hook) (instream, get_prompt ());

- quit_flag = 0;

+ clear_quit_flag ();

if (instream == stdin && stdin_is_tty)

reinitialize_more_filter ();

old_chain = make_cleanup (null_cleanup, 0);

@@ -708,7 +692,10 @@ show_write_history_p (struct ui_file *file, int from_tty,

value);

}

-static int history_size;

+/* The variable associated with the "set/show history size"

+ command. */

+static unsigned int history_size_setshow_var;

static void

show_history_size (struct ui_file *file, int from_tty,

struct cmd_list_element *c, const char *value)

@@ -873,13 +860,8 @@ gdb_rl_operate_and_get_next (int count, int key)

/* Find the current line, and find the next line to use. */

where = where_history();

- /* FIXME: kettenis/20020817: max_input_history is renamed into

- history_max_entries in readline-4.2. When we do a new readline

- import, we should probably change it here too, even though

- readline maintains backwards compatibility for now by still

- defining max_input_history. */

- if ((history_is_stifled () && (history_length >= max_input_history)) ||

- (where >= history_length - 1))

+ if ((history_is_stifled () && (history_length >= history_max_entries))

+ || (where >= history_length - 1))

operate_saved_history = where;

else

operate_saved_history = where + 1;

@@ -942,6 +924,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)

/* Control-C quits instantly if typed while in this loop

since it should not wait until the user types a newline. */

immediate_quit++;

+ QUIT;

#ifdef STOP_SIGNAL

if (job_control)

signal (STOP_SIGNAL, handle_stop_sig);

@@ -1079,8 +1062,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)

*p = 0;

/* Add line to history if appropriate. */

- if (instream == stdin

- && ISATTY (stdin) && *linebuffer)

+ if (*linebuffer && input_from_terminal_p ())

add_history (linebuffer);

/* Note: lines consisting solely of comments are added to the command

@@ -1120,7 +1102,7 @@ print_gdb_version (struct ui_file *stream)

/* Second line is a copyright notice. */

fprintf_filtered (stream,

/* Following the copyright is a brief statement that the program is

free software, that users are free to copy and change it on

@@ -1145,14 +1127,121 @@ and \"show warranty\" for details.\n");

{

fprintf_filtered (stream, "%s", host_name);

}

- fprintf_filtered (stream, "\".");

+ fprintf_filtered (stream, "\".\n\

+Type \"show configuration\" for configuration details.");

if (REPORT_BUGS_TO[0])

{

- fprintf_filtered (stream,

+ fprintf_filtered (stream,

_("\nFor bug reporting instructions, please see:\n"));

- fprintf_filtered (stream, "%s.", REPORT_BUGS_TO);

+ fprintf_filtered (stream, "%s.\n", REPORT_BUGS_TO);

}

+ fprintf_filtered (stream,

+ _("Find the GDB manual and other documentation \

+resources online at:\n<http://www.gnu.org/software/gdb/documentation/>.\n"));

+ fprintf_filtered (stream, _("For help, type \"help\".\n"));

+ fprintf_filtered (stream, _("Type \"apropos word\" to search for \

+commands related to \"word\"."));

+/* Print the details of GDB build-time configuration. */

+void

+print_gdb_configuration (struct ui_file *stream)