diff options
| -rw-r--r-- | gdb/ChangeLog | 21 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 10 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 2 | ||||
| -rw-r--r-- | gdb/frame.c | 14 | ||||
| -rw-r--r-- | gdb/remote.c | 14 | ||||
| -rw-r--r-- | gdb/top.c | 27 |
6 files changed, 55 insertions, 33 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9273658..21a6f01 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,24 @@ +2012-08-28 Yao Qi <yao@codesourcery.com> + + * cli/cli-cmds.c (max_user_call_depth): Add 'unsigned'. + (init_cmds): Call add_setshow_uinteger_cmd for command + 'max-user-call-depth'. + * cli/cli-script.c (execute_user_command): Add 'unsigned' to the + declaration of 'max_user_call_depth'. + * frame.c (backtrace_limit): Add 'unsigned'. + (_initialize_frame): Call add_setshow_uinteger_cmd for command + 'limit'. + * remote.c (remoteaddresssize): Add 'unsigned'. + (remote_address_masked): Change local var 'address_size' to + 'unsigned'. + (_initialize_remote): Call add_setshow_uinteger_cmd for + 'remoteaddresssize'. + * top.c (history_size): Add 'unsigned'. + (show_commands): Change local variables to 'unsigned'. + (set_history_size_command): Don't check history_size is negative. + Adjust the condition to call unstifle_history and set history_size + to UNIT_MAX. + 2012-08-28 Pedro Alves <palves@redhat.com> PR gdb/14428 diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 5d8a124..d3473d5 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -96,7 +96,7 @@ static void filter_sals (struct symtabs_and_lines *); /* Limit the call depth of user-defined commands */ -int max_user_call_depth; +unsigned int max_user_call_depth; /* Define all cmd_list_elements. */ @@ -1907,13 +1907,13 @@ With no argument, show definitions of all user defined commands."), &showlist); add_com ("apropos", class_support, apropos_command, _("Search for commands matching a REGEXP")); - add_setshow_integer_cmd ("max-user-call-depth", no_class, + add_setshow_uinteger_cmd ("max-user-call-depth", no_class, &max_user_call_depth, _("\ Set the max call depth for non-python user-defined commands."), _("\ Show the max call depth for non-python user-defined commands."), NULL, - NULL, - show_max_user_call_depth, - &setlist, &showlist); + NULL, + show_max_user_call_depth, + &setlist, &showlist); add_setshow_boolean_cmd ("trace-commands", no_class, &trace_commands, _("\ Set tracing of GDB CLI commands."), _("\ diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 4b6c416..743c65f 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -314,7 +314,7 @@ execute_user_command (struct cmd_list_element *c, char *args) struct cleanup *old_chain; enum command_control_type ret; static int user_call_depth = 0; - extern int max_user_call_depth; + extern unsigned int max_user_call_depth; cmdlines = c->user_commands; if (cmdlines == 0) diff --git a/gdb/frame.c b/gdb/frame.c index 278269d..9ed49f6 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -196,7 +196,7 @@ show_backtrace_past_entry (struct ui_file *file, int from_tty, value); } -static int backtrace_limit = INT_MAX; +static unsigned int backtrace_limit = UINT_MAX; static void show_backtrace_limit (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -2488,16 +2488,16 @@ the rest of the stack trace."), &set_backtrace_cmdlist, &show_backtrace_cmdlist); - add_setshow_integer_cmd ("limit", class_obscure, - &backtrace_limit, _("\ + add_setshow_uinteger_cmd ("limit", class_obscure, + &backtrace_limit, _("\ Set an upper bound on the number of backtrace levels."), _("\ Show the upper bound on the number of backtrace levels."), _("\ No more than the specified number of frames can be displayed or examined.\n\ Zero is unlimited."), - NULL, - show_backtrace_limit, - &set_backtrace_cmdlist, - &show_backtrace_cmdlist); + NULL, + show_backtrace_limit, + &set_backtrace_cmdlist, + &show_backtrace_cmdlist); /* Debug this files internals. */ add_setshow_zuinteger_cmd ("frame", class_maintenance, &frame_debug, _("\ diff --git a/gdb/remote.c b/gdb/remote.c index 2db2c9d..528f374 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -834,7 +834,7 @@ static struct serial *remote_desc = NULL; some remote targets this variable is principly provided to facilitate backward compatibility. */ -static int remote_address_size; +static unsigned int remote_address_size; /* Temporary to track who currently owns the terminal. See remote_terminal_* for more details. */ @@ -6314,7 +6314,7 @@ hexnumnstr (char *buf, ULONGEST num, int width) static CORE_ADDR remote_address_masked (CORE_ADDR addr) { - int address_size = remote_address_size; + unsigned int address_size = remote_address_size; /* If "remoteaddresssize" was not set, default to target address size. */ if (!address_size) @@ -11461,13 +11461,13 @@ Specify a negative limit for unlimited."), breakpoints is %s. */ &remote_set_cmdlist, &remote_show_cmdlist); - add_setshow_integer_cmd ("remoteaddresssize", class_obscure, - &remote_address_size, _("\ + add_setshow_uinteger_cmd ("remoteaddresssize", class_obscure, + &remote_address_size, _("\ Set the maximum size of the address (in bits) in a memory packet."), _("\ Show the maximum size of the address (in bits) in a memory packet."), NULL, - NULL, - NULL, /* FIXME: i18n: */ - &setlist, &showlist); + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); add_packet_config_cmd (&remote_protocol_packets[PACKET_X], "X", "binary-download", 1); @@ -710,7 +710,7 @@ show_write_history_p (struct ui_file *file, int from_tty, value); } -static int history_size; +static unsigned int history_size; static void show_history_size (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -1380,7 +1380,7 @@ show_commands (char *args, int from_tty) /* The first command in the history which doesn't exist (i.e. one more than the number of the last command). Relative to history_base. */ - int hist_len; + unsigned int hist_len; /* Print out some of the commands from the command history. */ /* First determine the length of the history list. */ @@ -1445,15 +1445,16 @@ show_commands (char *args, int from_tty) static void set_history_size_command (char *args, int from_tty, struct cmd_list_element *c) { - if (history_size == INT_MAX) - unstifle_history (); - else if (history_size >= 0) - stifle_history (history_size); - else + /* The type of parameter in stifle_history is int, so values from INT_MAX up + mean 'unlimited'. */ + if (history_size >= INT_MAX) { - history_size = INT_MAX; - error (_("History size must be non-negative")); + /* Ensure that 'show history size' prints 'unlimited'. */ + history_size = UINT_MAX; + unstifle_history (); } + else + stifle_history (history_size); } void @@ -1633,13 +1634,13 @@ Without an argument, saving is enabled."), show_write_history_p, &sethistlist, &showhistlist); - add_setshow_integer_cmd ("size", no_class, &history_size, _("\ + add_setshow_uinteger_cmd ("size", no_class, &history_size, _("\ Set the size of the command history,"), _("\ Show the size of the command history,"), _("\ ie. the number of previous commands to keep a record of."), - set_history_size_command, - show_history_size, - &sethistlist, &showhistlist); + set_history_size_command, + show_history_size, + &sethistlist, &showhistlist); add_setshow_filename_cmd ("filename", no_class, &history_filename, _("\ Set the filename in which to record the command history"), _("\ |