From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12493 invoked by alias); 13 Aug 2012 15:28:55 -0000 Received: (qmail 12252 invoked by uid 22791); 13 Aug 2012 15:28:51 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 13 Aug 2012 15:28:28 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1T0wZA-0004BX-AM from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Mon, 13 Aug 2012 08:28:28 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 13 Aug 2012 08:28:28 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Mon, 13 Aug 2012 08:28:27 -0700 From: Yao Qi To: Subject: [PATCH 2/3] var_integer -> var_zuinteger_unlimited Date: Mon, 13 Aug 2012 15:28:00 -0000 Message-ID: <1344871663-915-3-git-send-email-yao@codesourcery.com> In-Reply-To: <1344871663-915-1-git-send-email-yao@codesourcery.com> References: <7A6A55B4-0293-4AD6-AB1F-B3169F8ADCC1@cs.umd.edu> <1344871663-915-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-08/txt/msg00367.txt.bz2 Hi, With previous patch applied, var_integer are still used in two palces, 'listsize' and 'remotetimeout'. They are similar, 0 is allowed, and -1 means unlimited. Existing 'enum var_types' don't cover this kind of command, so I create a new one 'var_zuinteger_unlimited'. After this patch, var_integer is only used in python. gdb: 2012-08-13 Yao Qi * cli/cli-decode.c (add_setshow_zuinteger_unlimited_cmd): New. * cli/cli-setshow.c (do_set_command): Handle case 'var_zuinteger_unlimited'. (do_show_command): Likewise. * cli/cli-cmds.c (init_cmds): Call add_setshow_zuinteger_unlimited_cmd for command 'remotetimeout'. * command.h (enum var_types): New zuinteger_unlimited. * source.c (_initialize_source): Call add_setshow_zuinteger_unlimited_cmd for command 'set listsize'. gdb/doc: 2012-08-13 Yao Qi * gdb.texinfo(List): Describe the meaning of 0 and -1 in 'set listsize'. 2012-08-13 Yao Qi * gdb.base/list.exp (set_listsize): Don't set arg to "unlimited" when it is less than 0. --- gdb/cli/cli-cmds.c | 9 +++++---- gdb/cli/cli-decode.c | 19 +++++++++++++++++++ gdb/cli/cli-setshow.c | 30 +++++++++++++++++++++++++++++- gdb/command.h | 15 +++++++++++++++ gdb/doc/gdb.texinfo | 2 ++ gdb/source.c | 8 ++++---- gdb/testsuite/gdb.base/list.exp | 2 +- 7 files changed, 75 insertions(+), 10 deletions(-) diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 3d70c9e..4b23a0f 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1825,14 +1825,15 @@ is displayed."), show_remote_debug, &setdebuglist, &showdebuglist); - add_setshow_integer_cmd ("remotetimeout", no_class, &remote_timeout, _("\ + add_setshow_zuinteger_unlimited_cmd ("remotetimeout", no_class, + &remote_timeout, _("\ Set timeout limit to wait for target to respond."), _("\ Show timeout limit to wait for target to respond."), _("\ This value is used to set the time limit for gdb to wait for a response\n\ from the target."), - NULL, - show_remote_timeout, - &setlist, &showlist); + NULL, + show_remote_timeout, + &setlist, &showlist); add_prefix_cmd ("debug", no_class, set_debug, _("Generic command for setting gdb debugging flags"), diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 3c2e152..9e8218c 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -692,6 +692,25 @@ add_setshow_zinteger_cmd (char *name, enum command_class class, NULL, NULL); } +void +add_setshow_zuinteger_unlimited_cmd (char *name, + enum command_class class, + unsigned int *var, + const char *set_doc, + const char *show_doc, + const char *help_doc, + cmd_sfunc_ftype *set_func, + show_value_ftype *show_func, + struct cmd_list_element **set_list, + struct cmd_list_element **show_list) +{ + add_setshow_cmd_full (name, class, var_zuinteger_unlimited, var, + set_doc, show_doc, help_doc, + set_func, show_func, + set_list, show_list, + NULL, NULL); +} + /* Add element named NAME to both the set and show command LISTs (the list for set/show or some sublist thereof). CLASS is as in add_cmd. VAR is address of the variable which will contain the diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 89e095a..9d8cb2e 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -379,6 +379,26 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c) } } break; + case var_zuinteger_unlimited: + { + LONGEST val; + + if (arg == NULL) + error_no_arg (_("integer to set it to.")); + val = parse_and_eval_long (arg); + + if (val >= INT_MAX) + error (_("integer %s out of range"), plongest (val)); + else if (val < -1) + error (_("only -1 is allowed to set as unlimited")); + + if (*(int *) c->var != val) + { + *(int *) c->var = val; + option_changed = 1; + } + } + break; default: error (_("gdb internal error: bad var_type in do_setshow_command")); } @@ -478,6 +498,7 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c) break; case var_integer: case var_zinteger: + case var_zuinteger_unlimited: { char s[64]; @@ -562,7 +583,14 @@ do_show_command (char *arg, int from_tty, struct cmd_list_element *c) else fprintf_filtered (stb, "%d", *(int *) c->var); break; - + case var_zuinteger_unlimited: + { + if (*(int *) c->var == -1) + fputs_filtered ("unlimited", stb); + else + fprintf_filtered (stb, "%u", *(int *) c->var); + } + break; default: error (_("gdb internal error: bad var_type in do_show_command")); } diff --git a/gdb/command.h b/gdb/command.h index 88895bb..553bd717 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -99,6 +99,9 @@ typedef enum var_types /* ZeroableUnsignedInteger. *VAR is an unsigned int. Zero really means zero. */ var_zuinteger, + /* ZeroableUnsignedInteger with unlimited value. *VAR is an unsigned + int, but its range is [0, INT_MAX]. -1 stands for unlimited. */ + var_zuinteger_unlimited, /* Enumerated type. Can only have one of the specified values. *VAR is a char pointer to the name of the element that we find. */ @@ -354,6 +357,18 @@ extern void add_setshow_zuinteger_cmd (char *name, struct cmd_list_element **set_list, struct cmd_list_element **show_list); +extern void + add_setshow_zuinteger_unlimited_cmd (char *name, + enum command_class class, + unsigned int *var, + const char *set_doc, + const char *show_doc, + const char *help_doc, + cmd_sfunc_ftype *set_func, + show_value_ftype *show_func, + struct cmd_list_element **set_list, + struct cmd_list_element **show_list); + /* Do a "show" command for each thing on a command list. */ extern void cmd_show_list (struct cmd_list_element *, int, char *); diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 5cc5b48..2ccfecd 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6706,6 +6706,8 @@ the @code{list} command. You can change this using @code{set listsize}: @item set listsize @var{count} Make the @code{list} command display @var{count} source lines (unless the @code{list} argument explicitly specifies some other number). +Setting @var{count} to -1 means there's no limit and 0 means suppress +lines display. @kindex show listsize @item show listsize diff --git a/gdb/source.c b/gdb/source.c index 0ff0782..31e104f 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1965,12 +1965,12 @@ The matching line number is also stored as the value of \"$_\".")); add_com_alias ("?", "reverse-search", class_files, 0); } - add_setshow_integer_cmd ("listsize", class_support, &lines_to_list, _("\ + add_setshow_zuinteger_unlimited_cmd ("listsize", class_support, + &lines_to_list, _("\ Set number of source lines gdb will list by default."), _("\ Show number of source lines gdb will list by default."), NULL, - NULL, - show_lines_to_list, - &setlist, &showlist); + NULL, show_lines_to_list, + &setlist, &showlist); add_cmd ("substitute-path", class_files, set_substitute_path_command, _("\ diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index 6b5b207..9acb1c3 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -62,7 +62,7 @@ proc set_listsize { arg } { if [gdb_test "set listsize $arg" ".*" "setting listsize to $arg #$set_listsize_count"] { return 0; } - if { $arg <= 0 } { + if { $arg < 0 } { set arg "unlimited"; } -- 1.7.7.6