FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/

Browse source 
* cli/cli-decode.c (set_cmd_prefix): New.
	(lookup_cmd_for_prefixlist): New.
	(add_prefix_cmd): Call set_cmd_prefix and update field 'prefix'
	of each cmd_list_element in *prefixlist.
	(add_setshow_cmd_full): set_cmd_prefix.
	(add_alias_cmd): Likewise.
	* cli/cli-decode.h (struct cmd_list_element) <prefix>: New field.
	Declare 'auto_boolean_enums'.
	* cli/cli-setshow.c: Include "observer.h".
	(notify_command_param_changed_p): New.
	(add_setshow_auto_boolean_cmd): Move auto_boolean_enums out.
	Remove 'static'.
	(do_setshow_command): Split it to ...
	(do_set_command, do_show_command): ... them.  New.
	(do_set_command): Call observer_notify_command_param_changed if
	notify_command_param_changed_p returns true.
	(cmd_show_list): Caller update.
	* auto-load.c (set_auto_load_cmd): Likewise.
	* remote.c (show_remote_cmd): Likewise.
	* cli/cli-setshow.h: Update declarations.
	* top.c (execute_command): Call do_set_command and do_show_command.

	* NEWS: Mention new MI notification.
	* mi/mi-interp.c: Declare mi_command_param_changed.
	(mi_interpreter_init): Attach mi_command_param_changed to
	observer command_param_changed.
	(mi_command_param_changed): New.
	Remove mi_suppress_breakpoint_notifications.
	Define global variable mi_suppress_notification.
	(mi_breakpoint_created): Update.
	(mi_breakpoint_deleted): Likewise.
	(mi_breakpoint_modified): Likewise.
	* mi/mi-main.c (mi_cmd_execute): Likewise.  Check command
	'gdb-set' and set mi_suppress_notification.
	* mi/mi-main.h: (mi_suppress_notification): New struct.

gdb/doc/

	* observer.texi: New observer command_param_changed.
	* gdb.texinfo (GDB/MI Async Records): Doc for '=cmd-param-changed'.

gdb/testsuite/

	* gdb.mi/mi-cmd-param-changed.exp: New.
	* gdb.mi/mi-cli.exp: Update for MI notification "=cmd-param-changed".
	* gdb.mi/mi-var-rtti.exp, gdb.mi/mi2-cli.exp: Likewise.
	* gdb.mi/mi2-prompt.exp: Likewise.
This commit is contained in:
Yao Qi 2012-08-09 12:53:46 +00:00
parent d21911eadd
commit 5b9afe8a35
21 changed files with 742 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

38
gdb/ChangeLog
View file

@ -1,3 +1,41 @@
2012-08-09 Yao Qi <yao@codesourcery.com>
* cli/cli-decode.c (set_cmd_prefix): New.
(lookup_cmd_for_prefixlist): New.
(add_prefix_cmd): Call set_cmd_prefix and update field 'prefix'
of each cmd_list_element in *prefixlist.
(add_setshow_cmd_full): set_cmd_prefix.
(add_alias_cmd): Likewise.
* cli/cli-decode.h (struct cmd_list_element) <prefix>: New field.
Declare 'auto_boolean_enums'.
* cli/cli-setshow.c: Include "observer.h".
(notify_command_param_changed_p): New.
(add_setshow_auto_boolean_cmd): Move auto_boolean_enums out.
Remove 'static'.
(do_setshow_command): Split it to ...
(do_set_command, do_show_command): ... them. New.
(do_set_command): Call observer_notify_command_param_changed if
notify_command_param_changed_p returns true.
(cmd_show_list): Caller update.
* auto-load.c (set_auto_load_cmd): Likewise.
* remote.c (show_remote_cmd): Likewise.
* cli/cli-setshow.h: Update declarations.
* top.c (execute_command): Call do_set_command and do_show_command.
* NEWS: Mention new MI notification.
* mi/mi-interp.c: Declare mi_command_param_changed.
(mi_interpreter_init): Attach mi_command_param_changed to
observer command_param_changed.
(mi_command_param_changed): New.
Remove mi_suppress_breakpoint_notifications.
Define global variable mi_suppress_notification.
(mi_breakpoint_created): Update.
(mi_breakpoint_deleted): Likewise.
(mi_breakpoint_modified): Likewise.
* mi/mi-main.c (mi_cmd_execute): Likewise. Check command
'gdb-set' and set mi_suppress_notification.
* mi/mi-main.h: (mi_suppress_notification): New struct.
2012-08-09 Andreas Tobler <andreast@fgznet.ch> 2012-08-09 Andreas Tobler <andreast@fgznet.ch>
Jan Kratochvil <jan.kratochvil@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com>

5
gdb/NEWS
View file

@ -20,6 +20,11 @@
maint info bfds maint info bfds
List the BFDs known to GDB. List the BFDs known to GDB.
* MI changes
** Command parameter changes are now notified using new async record
"=cmd-param-changed".
*** Changes in GDB 7.5 *** Changes in GDB 7.5
* GDB now supports x32 ABI. Visit <http://sites.google.com/site/x32abi/> * GDB now supports x32 ABI. Visit <http://sites.google.com/site/x32abi/>

2
gdb/auto-load.c
View file

@ -1022,7 +1022,7 @@ set_auto_load_cmd (char *args, int from_tty)
if (list->var_type == var_boolean) if (list->var_type == var_boolean)
{ {
gdb_assert (list->type == set_cmd); gdb_assert (list->type == set_cmd);
do_setshow_command (args, from_tty, list); do_set_command (args, from_tty, list);
} }
} }

67
gdb/cli/cli-decode.c
View file

@ -52,6 +52,53 @@ static struct cmd_list_element *find_cmd (char *command,
static void help_all (struct ui_file *stream); static void help_all (struct ui_file *stream);
/* Look up a command whose 'prefixlist' is KEY. Return the command if found,
otherwise return NULL. */
static struct cmd_list_element *
lookup_cmd_for_prefixlist (struct cmd_list_element **key,
struct cmd_list_element *list)
{
struct cmd_list_element *p = NULL;
for (p = list; p != NULL; p = p->next)
{
struct cmd_list_element *q;
if (p->prefixlist == NULL)
continue;
else if (p->prefixlist == key)
return p;
q = lookup_cmd_for_prefixlist (key, *(p->prefixlist));
if (q != NULL)
return q;
}
return NULL;
}
static void
set_cmd_prefix (struct cmd_list_element *c, struct cmd_list_element **list)
{
struct cmd_list_element *p;
/* Check to see if *LIST contains any element other than C. */
for (p = *list; p != NULL; p = p->next)
if (p != c)
break;
if (p == NULL)
{
/* *SET_LIST only contains SET. */
p = lookup_cmd_for_prefixlist (list, setlist);
c->prefix = p ? (p->cmd_pointer ? p->cmd_pointer : p) : p;
}
else
c->prefix = p->prefix;
}
static void static void
print_help_for_command (struct cmd_list_element *c, char *prefix, int recurse, print_help_for_command (struct cmd_list_element *c, char *prefix, int recurse,
struct ui_file *stream); struct ui_file *stream);
@ -193,6 +240,7 @@ add_cmd (char *name, enum command_class class, void (*fun) (char *, int),
c->prefixlist = NULL; c->prefixlist = NULL;
c->prefixname = NULL; c->prefixname = NULL;
c->allow_unknown = 0; c->allow_unknown = 0;
c->prefix = NULL;
c->abbrev_flag = 0; c->abbrev_flag = 0;
set_cmd_completer (c, make_symbol_completion_list_fn); set_cmd_completer (c, make_symbol_completion_list_fn);
c->destroyer = NULL; c->destroyer = NULL;
@ -268,6 +316,8 @@ add_alias_cmd (char *name, char *oldname, enum command_class class,
c->cmd_pointer = old; c->cmd_pointer = old;
c->alias_chain = old->aliases; c->alias_chain = old->aliases;
old->aliases = c; old->aliases = c;
set_cmd_prefix (c, list);
return c; return c;
} }
@ -284,10 +334,21 @@ add_prefix_cmd (char *name, enum command_class class,
struct cmd_list_element **list) struct cmd_list_element **list)
{ {
struct cmd_list_element *c = add_cmd (name, class, fun, doc, list); struct cmd_list_element *c = add_cmd (name, class, fun, doc, list);
struct cmd_list_element *p;
c->prefixlist = prefixlist; c->prefixlist = prefixlist;
c->prefixname = prefixname; c->prefixname = prefixname;
c->allow_unknown = allow_unknown; c->allow_unknown = allow_unknown;
if (list == &cmdlist)
c->prefix = NULL;
else
set_cmd_prefix (c, list);
/* Update the field 'prefix' of each cmd_list_element in *PREFIXLIST. */
for (p = *prefixlist; p != NULL; p = p->next)
p->prefix = c;
return c; return c;
} }
@ -392,6 +453,9 @@ add_setshow_cmd_full (char *name,
full_set_doc, set_list); full_set_doc, set_list);
if (set_func != NULL) if (set_func != NULL)
set_cmd_sfunc (set, set_func); set_cmd_sfunc (set, set_func);
set_cmd_prefix (set, set_list);
show = add_set_or_show_cmd (name, show_cmd, class, var_type, var, show = add_set_or_show_cmd (name, show_cmd, class, var_type, var,
full_show_doc, show_list); full_show_doc, show_list);
show->show_value_func = show_func; show->show_value_func = show_func;
@ -430,6 +494,8 @@ add_setshow_enum_cmd (char *name,
c->enums = enumlist; c->enums = enumlist;
} }
const char * const auto_boolean_enums[] = { "on", "off", "auto", NULL };
/* Add an auto-boolean command named NAME to both the set and show /* Add an auto-boolean command named NAME to both the set and show
command list lists. CLASS is as in add_cmd. VAR is address of the command list lists. CLASS is as in add_cmd. VAR is address of the
variable which will contain the value. DOC is the documentation variable which will contain the value. DOC is the documentation
@ -445,7 +511,6 @@ add_setshow_auto_boolean_cmd (char *name,
struct cmd_list_element **set_list, struct cmd_list_element **set_list,
struct cmd_list_element **show_list) struct cmd_list_element **show_list)
{ {
static const char *auto_boolean_enums[] = { "on", "off", "auto", NULL };
struct cmd_list_element *c; struct cmd_list_element *c;
add_setshow_cmd_full (name, class, var_auto_boolean, var, add_setshow_cmd_full (name, class, var_auto_boolean, var,

4
gdb/cli/cli-decode.h
View file

@ -149,6 +149,9 @@ struct cmd_list_element
recognized; call the prefix's own function in that case. */ recognized; call the prefix's own function in that case. */
char allow_unknown; char allow_unknown;
/* The prefix command of this command. */
struct cmd_list_element *prefix;
/* Nonzero says this is an abbreviation, and should not /* Nonzero says this is an abbreviation, and should not
be mentioned in lists of commands. be mentioned in lists of commands.
This allows "br<tab>" to complete to "break", which it This allows "br<tab>" to complete to "break", which it
@ -232,5 +235,6 @@ extern void not_just_help_class_command (char *arg, int from_tty);
extern void print_doc_line (struct ui_file *, char *); extern void print_doc_line (struct ui_file *, char *);
extern const char * const auto_boolean_enums[];
#endif /* !defined (CLI_DECODE_H) */ #endif /* !defined (CLI_DECODE_H) */

657
gdb/cli/cli-setshow.c
View file

@ -21,6 +21,7 @@
#include <ctype.h> #include <ctype.h>
#include "gdb_string.h" #include "gdb_string.h"
#include "arch-utils.h" #include "arch-utils.h"
#include "observer.h"
#include "ui-out.h" #include "ui-out.h"
@ -32,6 +33,21 @@
static int parse_binary_operation (char *); static int parse_binary_operation (char *);
/* Return true if the change of command parameter should be notified. */
static int
notify_command_param_changed_p (int param_changed, struct cmd_list_element *c)
{
if (param_changed == 0)
return 0;
if (c->class == class_maintenance || c->class == class_deprecated
|| c->class == class_obscure)
return 0;
return 1;
}
static enum auto_boolean static enum auto_boolean
parse_auto_binary_operation (const char *arg) parse_auto_binary_operation (const char *arg)
@ -116,283 +132,462 @@ deprecated_show_value_hack (struct ui_file *ignore_file,
} }
} }
/* Do a "set" or "show" command. ARG is NULL if no argument, or the /* Do a "set" command. ARG is NULL if no argument, or the
text of the argument, and FROM_TTY is nonzero if this command is text of the argument, and FROM_TTY is nonzero if this command is
being entered directly by the user (i.e. these are just like any being entered directly by the user (i.e. these are just like any
other command). C is the command list element for the command. */ other command). C is the command list element for the command. */
void void
do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c) do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
{ {
struct ui_out *uiout = current_uiout; /* A flag to indicate the option is changed or not. */
int option_changed = 0;
if (c->type == set_cmd) gdb_assert (c->type == set_cmd);
switch (c->var_type)
{ {
switch (c->var_type) case var_string:
{ {
case var_string: char *new;
{ char *p;
char *new; char *q;
char *p; int ch;
char *q;
int ch;
if (arg == NULL) if (arg == NULL)
arg = ""; arg = "";
new = (char *) xmalloc (strlen (arg) + 2); new = (char *) xmalloc (strlen (arg) + 2);
p = arg; p = arg;
q = new; q = new;
while ((ch = *p++) != '\000') while ((ch = *p++) != '\000')
{
if (ch == '\\')
{ {
if (ch == '\\') /* \ at end of argument is used after spaces
{ so they won't be lost. */
/* \ at end of argument is used after spaces /* This is obsolete now that we no longer strip
so they won't be lost. */ trailing whitespace and actually, the backslash
/* This is obsolete now that we no longer strip didn't get here in my test, readline or
trailing whitespace and actually, the backslash something did something funky with a backslash
didn't get here in my test, readline or right before a newline. */
something did something funky with a backslash if (*p == 0)
right before a newline. */ break;
if (*p == 0) ch = parse_escape (get_current_arch (), &p);
break; if (ch == 0)
ch = parse_escape (get_current_arch (), &p); break; /* C loses */
if (ch == 0) else if (ch > 0)
break; /* C loses */
else if (ch > 0)
*q++ = ch;
}
else
*q++ = ch; *q++ = ch;
} }
else
*q++ = ch;
}
#if 0 #if 0
if (*(p - 1) != '\\') if (*(p - 1) != '\\')
*q++ = ' '; *q++ = ' ';
#endif #endif
*q++ = '\0'; *q++ = '\0';
new = (char *) xrealloc (new, q - new); new = (char *) xrealloc (new, q - new);
if (*(char **) c->var == NULL
|| strcmp (*(char **) c->var, new) != 0)
{
xfree (*(char **) c->var); xfree (*(char **) c->var);
*(char **) c->var = new; *(char **) c->var = new;
option_changed = 1;
} }
break; else
case var_string_noescape: xfree (new);
if (arg == NULL) }
arg = ""; break;
case var_string_noescape:
if (arg == NULL)
arg = "";
if (*(char **) c->var == NULL || strcmp (*(char **) c->var, arg) != 0)
{
xfree (*(char **) c->var); xfree (*(char **) c->var);
*(char **) c->var = xstrdup (arg); *(char **) c->var = xstrdup (arg);
break;
case var_filename:
if (arg == NULL)
error_no_arg (_("filename to set it to."));
/* FALLTHROUGH */
case var_optional_filename:
xfree (*(char **) c->var);
if (arg != NULL) option_changed = 1;
{
/* Clear trailing whitespace of filename. */
char *ptr = arg + strlen (arg) - 1;
while (ptr >= arg && (*ptr == ' ' || *ptr == '\t'))
ptr--;
*(ptr + 1) = '\0';
*(char **) c->var = tilde_expand (arg);
}
else
*(char **) c->var = xstrdup ("");
break;
case var_boolean:
*(int *) c->var = parse_binary_operation (arg);
break;
case var_auto_boolean:
*(enum auto_boolean *) c->var = parse_auto_binary_operation (arg);
break;
case var_uinteger:
case var_zuinteger:
if (arg == NULL)
error_no_arg (_("integer to set it to."));
*(unsigned int *) c->var = parse_and_eval_long (arg);
if (c->var_type == var_uinteger && *(unsigned int *) c->var == 0)
*(unsigned int *) c->var = UINT_MAX;
break;
case var_integer:
case var_zinteger:
{
unsigned int val;
if (arg == NULL)
error_no_arg (_("integer to set it to."));
val = parse_and_eval_long (arg);
if (val == 0 && c->var_type == var_integer)
*(int *) c->var = INT_MAX;
else if (val >= INT_MAX)
error (_("integer %u out of range"), val);
else
*(int *) c->var = val;
break;
}
case var_enum:
{
int i;
int len;
int nmatches;
const char *match = NULL;
char *p;
/* If no argument was supplied, print an informative error
message. */
if (arg == NULL)
{
char *msg;
int msg_len = 0;
for (i = 0; c->enums[i]; i++)
msg_len += strlen (c->enums[i]) + 2;
msg = xmalloc (msg_len);
*msg = '\0';
make_cleanup (xfree, msg);
for (i = 0; c->enums[i]; i++)
{
if (i != 0)
strcat (msg, ", ");
strcat (msg, c->enums[i]);
}
error (_("Requires an argument. Valid arguments are %s."),
msg);
}
p = strchr (arg, ' ');
if (p)
len = p - arg;
else
len = strlen (arg);
nmatches = 0;
for (i = 0; c->enums[i]; i++)
if (strncmp (arg, c->enums[i], len) == 0)
{
if (c->enums[i][len] == '\0')
{
match = c->enums[i];
nmatches = 1;
break; /* Exact match. */
}
else
{
match = c->enums[i];
nmatches++;
}
}
if (nmatches <= 0)
error (_("Undefined item: \"%s\"."), arg);
if (nmatches > 1)
error (_("Ambiguous item \"%s\"."), arg);
*(const char **) c->var = match;
}
break;
default:
error (_("gdb internal error: bad var_type in do_setshow_command"));
} }
break;
case var_filename:
if (arg == NULL)
error_no_arg (_("filename to set it to."));
/* FALLTHROUGH */
case var_optional_filename:
{
char *val = NULL;
if (arg != NULL)
{
/* Clear trailing whitespace of filename. */
char *ptr = arg + strlen (arg) - 1;
while (ptr >= arg && (*ptr == ' ' || *ptr == '\t'))
ptr--;
*(ptr + 1) = '\0';
val = tilde_expand (arg);
}
else
val = xstrdup ("");
if (*(char **) c->var == NULL
|| strcmp (*(char **) c->var, val) != 0)
{
xfree (*(char **) c->var);
*(char **) c->var = val;
option_changed = 1;
}
else
xfree (val);
}
break;
case var_boolean:
{
int val = parse_binary_operation (arg);
if (val != *(int *) c->var)
{
*(int *) c->var = val;
option_changed = 1;
}
}
break;
case var_auto_boolean:
{
enum auto_boolean val = parse_auto_binary_operation (arg);
if (*(enum auto_boolean *) c->var != val)
{
*(enum auto_boolean *) c->var = val;
option_changed = 1;
}
}
break;
case var_uinteger:
case var_zuinteger:
if (arg == NULL)
error_no_arg (_("integer to set it to."));
{
unsigned int val = parse_and_eval_long (arg);
if (c->var_type == var_uinteger && val == 0)
val = UINT_MAX;
if (*(unsigned int *) c->var != val)
{
*(unsigned int *) c->var = val;
option_changed = 1;
}
}
break;
case var_integer:
case var_zinteger:
{
unsigned int val;
if (arg == NULL)
error_no_arg (_("integer to set it to."));
val = parse_and_eval_long (arg);
if (val == 0 && c->var_type == var_integer)
val = INT_MAX;
else if (val >= INT_MAX)
error (_("integer %u out of range"), val);
if (*(int *) c->var != val)
{
*(int *) c->var = val;
option_changed = 1;
}
break;
}
case var_enum:
{
int i;
int len;
int nmatches;
const char *match = NULL;
char *p;
/* If no argument was supplied, print an informative error
message. */
if (arg == NULL)
{
char *msg;
int msg_len = 0;
for (i = 0; c->enums[i]; i++)
msg_len += strlen (c->enums[i]) + 2;
msg = xmalloc (msg_len);
*msg = '\0';
make_cleanup (xfree, msg);
for (i = 0; c->enums[i]; i++)
{
if (i != 0)
strcat (msg, ", ");
strcat (msg, c->enums[i]);
}
error (_("Requires an argument. Valid arguments are %s."),
msg);
}
p = strchr (arg, ' ');
if (p)
len = p - arg;
else
len = strlen (arg);
nmatches = 0;
for (i = 0; c->enums[i]; i++)
if (strncmp (arg, c->enums[i], len) == 0)
{
if (c->enums[i][len] == '\0')
{
match = c->enums[i];
nmatches = 1;
break; /* Exact match. */
}
else
{
match = c->enums[i];
nmatches++;
}
}
if (nmatches <= 0)
error (_("Undefined item: \"%s\"."), arg);
if (nmatches > 1)
error (_("Ambiguous item \"%s\"."), arg);
if (*(const char **) c->var != match)
{
*(const char **) c->var = match;
option_changed = 1;
}
}
break;
default:
error (_("gdb internal error: bad var_type in do_setshow_command"));
} }
else if (c->type == show_cmd) c->func (c, NULL, from_tty);
if (deprecated_set_hook)
deprecated_set_hook (c);
if (notify_command_param_changed_p (option_changed, c))
{ {
struct cleanup *old_chain; char *name, *cp;
struct ui_file *stb; struct cmd_list_element **cmds;
struct cmd_list_element *p;
int i;
int length = 0;
stb = mem_fileopen (); /* Compute the whole multi-word command options. If user types command
old_chain = make_cleanup_ui_file_delete (stb); 'set foo bar baz on', c->name is 'baz', and GDB can't pass "bar" to
command option change notification, because it is confusing. We can
trace back through field 'prefix' to compute the whole options,
and pass "foo bar baz" to notification. */
/* Possibly call the pre hook. */ for (i = 0, p = c; p != NULL; i++)
if (c->pre_show_hook) {
(c->pre_show_hook) (c); length += strlen (p->name);
length++;
p = p->prefix;
}
cp = name = xmalloc (length);
cmds = xmalloc (sizeof (struct cmd_list_element *) * i);
/* Track back through filed 'prefix' and cache them in CMDS. */
for (i = 0, p = c; p != NULL; i++)
{
cmds[i] = p;
p = p->prefix;
}
/* Don't trigger any observer notification if prefixlist is not
setlist. */
i--;
if (cmds[i]->prefixlist != &setlist)
{
xfree (cmds);
xfree (name);
return;
}
/* Traverse them in the reversed order, and copy their names into
NAME. */
for (i--; i >= 0; i--)
{
memcpy (cp, cmds[i]->name, strlen (cmds[i]->name));
cp += strlen (cmds[i]->name);
if (i != 0)
{
cp[0] = ' ';
cp++;
}
}
cp[0] = 0;
xfree (cmds);
switch (c->var_type) switch (c->var_type)
{ {
case var_string: case var_string:
if (*(char **) c->var)
fputstr_filtered (*(char **) c->var, '"', stb);
break;
case var_string_noescape: case var_string_noescape:
case var_optional_filename:
case var_filename: case var_filename:
case var_optional_filename:
case var_enum: case var_enum:
if (*(char **) c->var) observer_notify_command_param_changed (name, *(char **) c->var);
fputs_filtered (*(char **) c->var, stb);
break; break;
case var_boolean: case var_boolean:
fputs_filtered (*(int *) c->var ? "on" : "off", stb); {
char *opt = *(int *) c->var ? "on" : "off";
observer_notify_command_param_changed (name, opt);
}
break; break;
case var_auto_boolean: case var_auto_boolean:
switch (*(enum auto_boolean*) c->var) {
{ const char *s = auto_boolean_enums[*(enum auto_boolean *) c->var];
case AUTO_BOOLEAN_TRUE:
fputs_filtered ("on", stb); observer_notify_command_param_changed (name, s);
break; }
case AUTO_BOOLEAN_FALSE:
fputs_filtered ("off", stb);
break;
case AUTO_BOOLEAN_AUTO:
fputs_filtered ("auto", stb);
break;
default:
internal_error (__FILE__, __LINE__,
_("do_setshow_command: "
"invalid var_auto_boolean"));
break;
}
break; break;
case var_uinteger: case var_uinteger:
case var_zuinteger: case var_zuinteger:
if (c->var_type == var_uinteger {
&& *(unsigned int *) c->var == UINT_MAX) char s[64];
fputs_filtered ("unlimited", stb);
else xsnprintf (s, sizeof s, "%u", *(unsigned int *) c->var);
fprintf_filtered (stb, "%u", *(unsigned int *) c->var); observer_notify_command_param_changed (name, s);
}
break; break;
case var_integer: case var_integer:
case var_zinteger: case var_zinteger:
if (c->var_type == var_integer {
&& *(int *) c->var == INT_MAX) char s[64];
fputs_filtered ("unlimited", stb);
else xsnprintf (s, sizeof s, "%d", *(int *) c->var);
fprintf_filtered (stb, "%d", *(int *) c->var); observer_notify_command_param_changed (name, s);
}
break; break;
default:
error (_("gdb internal error: bad var_type in do_setshow_command"));
} }
xfree (name);
/* FIXME: cagney/2005-02-10: Need to split this in half: code to
convert the value into a string (esentially the above); and
code to print the value out. For the latter there should be
MI and CLI specific versions. */
if (ui_out_is_mi_like_p (uiout))
ui_out_field_stream (uiout, "value", stb);
else
{
char *value = ui_file_xstrdup (stb, NULL);
make_cleanup (xfree, value);
if (c->show_value_func != NULL)
c->show_value_func (gdb_stdout, from_tty, c, value);
else
deprecated_show_value_hack (gdb_stdout, from_tty, c, value);
}
do_cleanups (old_chain);
} }
}
/* Do a "show" command. ARG is NULL if no argument, or the
text of the argument, and FROM_TTY is nonzero if this command is
being entered directly by the user (i.e. these are just like any
other command). C is the command list element for the command. */
void
do_show_command (char *arg, int from_tty, struct cmd_list_element *c)
{
struct ui_out *uiout = current_uiout;
struct cleanup *old_chain;
struct ui_file *stb;
gdb_assert (c->type == show_cmd);
stb = mem_fileopen ();
old_chain = make_cleanup_ui_file_delete (stb);
/* Possibly call the pre hook. */
if (c->pre_show_hook)
(c->pre_show_hook) (c);
switch (c->var_type)
{
case var_string:
if (*(char **) c->var)
fputstr_filtered (*(char **) c->var, '"', stb);
break;
case var_string_noescape:
case var_optional_filename:
case var_filename:
case var_enum:
if (*(char **) c->var)
fputs_filtered (*(char **) c->var, stb);
break;
case var_boolean:
fputs_filtered (*(int *) c->var ? "on" : "off", stb);
break;
case var_auto_boolean:
switch (*(enum auto_boolean*) c->var)
{
case AUTO_BOOLEAN_TRUE:
fputs_filtered ("on", stb);
break;
case AUTO_BOOLEAN_FALSE:
fputs_filtered ("off", stb);
break;
case AUTO_BOOLEAN_AUTO:
fputs_filtered ("auto", stb);
break;
default:
internal_error (__FILE__, __LINE__,
_("do_show_command: "
"invalid var_auto_boolean"));
break;
}
break;
case var_uinteger:
case var_zuinteger:
if (c->var_type == var_uinteger
&& *(unsigned int *) c->var == UINT_MAX)
fputs_filtered ("unlimited", stb);
else
fprintf_filtered (stb, "%u", *(unsigned int *) c->var);
break;
case var_integer:
case var_zinteger:
if (c->var_type == var_integer
&& *(int *) c->var == INT_MAX)
fputs_filtered ("unlimited", stb);
else
fprintf_filtered (stb, "%d", *(int *) c->var);
break;
default:
error (_("gdb internal error: bad var_type in do_show_command"));
}
/* FIXME: cagney/2005-02-10: Need to split this in half: code to
convert the value into a string (esentially the above); and
code to print the value out. For the latter there should be
MI and CLI specific versions. */
if (ui_out_is_mi_like_p (uiout))
ui_out_field_stream (uiout, "value", stb);
else else
error (_("gdb internal error: bad cmd_type in do_setshow_command")); {
char *value = ui_file_xstrdup (stb, NULL);
make_cleanup (xfree, value);
if (c->show_value_func != NULL)
c->show_value_func (gdb_stdout, from_tty, c, value);
else
deprecated_show_value_hack (gdb_stdout, from_tty, c, value);
}
do_cleanups (old_chain);
c->func (c, NULL, from_tty); c->func (c, NULL, from_tty);
if (c->type == set_cmd && deprecated_set_hook)
deprecated_set_hook (c);
} }
/* Show all the settings in a list of show commands. */ /* Show all the settings in a list of show commands. */
@ -431,7 +626,7 @@ cmd_show_list (struct cmd_list_element *list, int from_tty, char *prefix)
ui_out_field_string (uiout, "name", list->name); ui_out_field_string (uiout, "name", list->name);
ui_out_text (uiout, ": "); ui_out_text (uiout, ": ");
if (list->type == show_cmd) if (list->type == show_cmd)
do_setshow_command ((char *) NULL, from_tty, list); do_show_command ((char *) NULL, from_tty, list);
else else
cmd_func (list, NULL, from_tty); cmd_func (list, NULL, from_tty);
/* Close the tuple. */ /* Close the tuple. */

10
gdb/cli/cli-setshow.h
View file

@ -21,12 +21,10 @@ struct cmd_list_element;
/* Exported to cli/cli-cmds.c and gdb/top.c */ /* Exported to cli/cli-cmds.c and gdb/top.c */
/* Do a "set" or "show" command. ARG is NULL if no argument, or the extern void do_set_command (char *arg, int from_tty,
text of the argument, and FROM_TTY is nonzero if this command is struct cmd_list_element *c);
being entered directly by the user (i.e. these are just like any extern void do_show_command (char *arg, int from_tty,
other command). C is the command list element for the command. */ struct cmd_list_element *c);
extern void do_setshow_command (char *arg, int from_tty,
struct cmd_list_element *c);
/* Exported to cli/cli-cmds.c and gdb/top.c, language.c and valprint.c */ /* Exported to cli/cli-cmds.c and gdb/top.c, language.c and valprint.c */

5
gdb/doc/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-09 Yao Qi <yao@codesourcery.com>
* observer.texi: New observer command_param_changed.
* gdb.texinfo (GDB/MI Async Records): Doc for '=cmd-param-changed'.
2012-08-07 Jan Kratochvil <jan.kratochvil@redhat.com> 2012-08-07 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdbint.texinfo (Debugging GDB): In section * gdbint.texinfo (Debugging GDB): In section

6
gdb/doc/gdb.texinfo
View file

@ -27620,6 +27620,12 @@ breakpoint commands; @xref{GDB/MI Breakpoint Commands}. The
Note that if a breakpoint is emitted in the result record of a Note that if a breakpoint is emitted in the result record of a
command, then it will not also be emitted in an async record. command, then it will not also be emitted in an async record.
@item =cmd-param-changed,param=@var{param},value=@var{value}
Reports that a parameter of the command @code{set @var{param}} is
changed to @var{value}. In the multi-word @code{set} command,
the @var{param} is the whole parameter list to @code{set} command.
For example, In command @code{set check type on}, @var{param}
is @code{check type} and @var{value} is @code{on}.
@end table @end table
@node GDB/MI Frame Information @node GDB/MI Frame Information

8
gdb/doc/observer.texi
View file

@ -230,6 +230,14 @@ the current top-level prompt.
Variable gdb_datadir has been set. The value may not necessarily change. Variable gdb_datadir has been set. The value may not necessarily change.
@end deftypefun @end deftypefun
@deftypefun void command_param_changed (const char *@var{param}, const char *@var{value})
The parameter of some @code{set} commands in console are changed. This
method is called after a command @code{set @var{param} @var{value}}.
@var{param} is the parameter of @code{set} command, and @var{value}
is the value of changed parameter.
@end deftypefun
@deftypefun void test_notification (int @var{somearg}) @deftypefun void test_notification (int @var{somearg})
This observer is used for internal testing. Do not use. This observer is used for internal testing. Do not use.
See testsuite/gdb.gdb/observer.exp. See testsuite/gdb.gdb/observer.exp.

44
gdb/mi/mi-interp.c
View file

@ -71,6 +71,7 @@ static void mi_about_to_proceed (void);
static void mi_breakpoint_created (struct breakpoint *b); static void mi_breakpoint_created (struct breakpoint *b);
static void mi_breakpoint_deleted (struct breakpoint *b); static void mi_breakpoint_deleted (struct breakpoint *b);
static void mi_breakpoint_modified (struct breakpoint *b); static void mi_breakpoint_modified (struct breakpoint *b);
static void mi_command_param_changed (const char *param, const char *value);
static int report_initial_inferior (struct inferior *inf, void *closure); static int report_initial_inferior (struct inferior *inf, void *closure);
@ -128,6 +129,7 @@ mi_interpreter_init (struct interp *interp, int top_level)
observer_attach_breakpoint_created (mi_breakpoint_created); observer_attach_breakpoint_created (mi_breakpoint_created);
observer_attach_breakpoint_deleted (mi_breakpoint_deleted); observer_attach_breakpoint_deleted (mi_breakpoint_deleted);
observer_attach_breakpoint_modified (mi_breakpoint_modified); observer_attach_breakpoint_modified (mi_breakpoint_modified);
observer_attach_command_param_changed (mi_command_param_changed);
/* The initial inferior is created before this function is /* The initial inferior is created before this function is
called, so we need to report it explicitly. Use iteration in called, so we need to report it explicitly. Use iteration in
@ -501,10 +503,14 @@ mi_about_to_proceed (void)
mi_proceeded = 1; mi_proceeded = 1;
} }
/* When non-zero, no MI notifications will be emitted in /* When the element is non-zero, no MI notifications will be emitted in
response to breakpoint change observers. */ response to the corresponding observers. */
int mi_suppress_breakpoint_notifications = 0; struct mi_suppress_notification mi_suppress_notification =
{
0,
0,
};
/* Emit notification about a created breakpoint. */ /* Emit notification about a created breakpoint. */
@ -515,7 +521,7 @@ mi_breakpoint_created (struct breakpoint *b)
struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ());
volatile struct gdb_exception e; volatile struct gdb_exception e;
if (mi_suppress_breakpoint_notifications) if (mi_suppress_notification.breakpoint)
return; return;
if (b->number <= 0) if (b->number <= 0)
@ -546,7 +552,7 @@ mi_breakpoint_deleted (struct breakpoint *b)
{ {
struct mi_interp *mi = top_level_interpreter_data (); struct mi_interp *mi = top_level_interpreter_data ();
if (mi_suppress_breakpoint_notifications) if (mi_suppress_notification.breakpoint)
return; return;
if (b->number <= 0) if (b->number <= 0)
@ -569,7 +575,7 @@ mi_breakpoint_modified (struct breakpoint *b)
struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ());
volatile struct gdb_exception e; volatile struct gdb_exception e;
if (mi_suppress_breakpoint_notifications) if (mi_suppress_notification.breakpoint)
return; return;
if (b->number <= 0) if (b->number <= 0)
@ -730,6 +736,32 @@ mi_solib_unloaded (struct so_list *solib)
gdb_flush (mi->event_channel); gdb_flush (mi->event_channel);
} }
/* Emit notification about the command parameter change. */
static void
mi_command_param_changed (const char *param, const char *value)
{
struct mi_interp *mi = top_level_interpreter_data ();
struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ());
if (mi_suppress_notification.cmd_param_changed)
return;
target_terminal_ours ();
fprintf_unfiltered (mi->event_channel,
"cmd-param-changed");
ui_out_redirect (mi_uiout, mi->event_channel);
ui_out_field_string (mi_uiout, "param", param);
ui_out_field_string (mi_uiout, "value", value);
ui_out_redirect (mi_uiout, NULL);
gdb_flush (mi->event_channel);
}
static int static int
report_initial_inferior (struct inferior *inf, void *closure) report_initial_inferior (struct inferior *inf, void *closure)
{ {

11
gdb/mi/mi-main.c
View file

@ -2099,8 +2099,15 @@ mi_cmd_execute (struct mi_parse *parse)
if (strncmp (parse->command, "break-", sizeof ("break-") - 1 ) == 0) if (strncmp (parse->command, "break-", sizeof ("break-") - 1 ) == 0)
{ {
make_cleanup_restore_integer (&mi_suppress_breakpoint_notifications); make_cleanup_restore_integer (&mi_suppress_notification.breakpoint);
mi_suppress_breakpoint_notifications = 1; mi_suppress_notification.breakpoint = 1;
}
else if (strncmp (parse->command, "gdb-set", sizeof ("gdb-set") - 1) == 0)
{
int *p = &mi_suppress_notification.cmd_param_changed;
make_cleanup_restore_integer (p);
mi_suppress_notification.cmd_param_changed = 1;
} }
if (parse->cmd->argv_func != NULL) if (parse->cmd->argv_func != NULL)

10
gdb/mi/mi-main.h
View file

@ -32,7 +32,15 @@ extern char *current_token;
extern int running_result_record_printed; extern int running_result_record_printed;
extern int mi_proceeded; extern int mi_proceeded;
extern int mi_suppress_breakpoint_notifications;
struct mi_suppress_notification
{
/* Breakpoint notification suppressed? */
int breakpoint;
/* Command param changed notification suppressed? */
int cmd_param_changed;
};
extern struct mi_suppress_notification mi_suppress_notification;
#endif #endif

2
gdb/remote.c
View file

@ -11232,7 +11232,7 @@ show_remote_cmd (char *args, int from_tty)
ui_out_field_string (uiout, "name", list->name); ui_out_field_string (uiout, "name", list->name);
ui_out_text (uiout, ": "); ui_out_text (uiout, ": ");
if (list->type == show_cmd) if (list->type == show_cmd)
do_setshow_command ((char *) NULL, from_tty, list); do_show_command ((char *) NULL, from_tty, list);
else else
cmd_func (list, NULL, from_tty); cmd_func (list, NULL, from_tty);
/* Close the tuple. */ /* Close the tuple. */

7
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2012-08-09 Yao Qi <yao@codesourcery.com>
* gdb.mi/mi-cmd-param-changed.exp: New.
* gdb.mi/mi-cli.exp: Update for MI notification "=cmd-param-changed".
* gdb.mi/mi-var-rtti.exp, gdb.mi/mi2-cli.exp: Likewise.
* gdb.mi/mi2-prompt.exp: Likewise.
2012-08-08 Doug Evans <dje@google.com> 2012-08-08 Doug Evans <dje@google.com>
* gdb.base/debug-expr.c: New file. * gdb.base/debug-expr.c: New file.

4
gdb/testsuite/gdb.mi/mi-cli.exp
View file

@ -70,7 +70,7 @@ set line_callee4_body [expr $line_callee4_head + 2]
set line_callee4_next [expr $line_callee4_body + 1] set line_callee4_next [expr $line_callee4_body + 1]
mi_gdb_test "-interpreter-exec console \"set args foobar\"" \ mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
{\^done} \ ".*=cmd-param-changed,param=\"args\",value=\"foobar\".*\\^done" \
"-interpreter-exec console \"set args foobar\"" "-interpreter-exec console \"set args foobar\""
mi_gdb_test "-interpreter-exec console \"show args\"" \ mi_gdb_test "-interpreter-exec console \"show args\"" \
@ -90,7 +90,7 @@ mi_gdb_test "-interpreter-exec console \"info break\"" \
"-interpreter-exec console \"info break\"" "-interpreter-exec console \"info break\""
mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \ mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
{\^done} \ ".*=cmd-param-changed,param=\"listsize\",value=\"1\".*\\^done" \
"-interpreter-exec console \"set listsize 1\"" "-interpreter-exec console \"set listsize 1\""
# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done } # {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }

103
gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp Normal file
View file

@ -0,0 +1,103 @@
# Copyright 2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
load_lib mi-support.exp
set MIFLAGS "-i=mi"
standard_testfile basics.c
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
untested mi-cmd-param-changed.exp
return -1
}
proc test_command_param_changed { } { with_test_prefix "cmd param" {
if [mi_gdb_start] {
return
}
mi_run_to_main
foreach opt { "on" "off" "step" } {
mi_gdb_test "set scheduler-locking ${opt}" \
".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
"\"set scheduler-locking ${opt}\""
}
foreach opt { "on" "off" "step" } {
mi_gdb_test "interpreter-exec console \"set scheduler-locking ${opt}\"" \
".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
"interpreter-exec \"set scheduler-locking ${opt}\""
}
# Don't emit MI notification for request from MI.
mi_gdb_test "-gdb-set scheduler-locking on" \
{\^done} \
"\"set scheduler-locking on\" no event (requested by MI)"
mi_gdb_test "interpreter-exec mi \"-gdb-set scheduler-locking step\"" \
"\\&\"interpreter-exec mi .*\"-gdb-set scheduler-locking step.*\"\\\\n\"\r\n\\^done\r\n\\^done" \
"\"set scheduler-locking step\" no event (requested by MI interp)"
mi_gdb_test "set scheduler-locking step" \
"\\&\"set scheduler-locking step\\\\n\"\r\n\\^done" \
"\"set scheduler-locking stepr\" no event"
foreach command { "circular-trace-buffer" "check type" } {
# The default value of each command option may be different, so we first
# set it to 'off', and this may or may not trigger MI notification.
mi_gdb_test "set ${command} off" ".*\\^done" "\"set ${command}\" warmup"
foreach boolean_opt { "on" "off" } {
mi_gdb_test "set ${command} ${boolean_opt}" \
".*=cmd-param-changed,param=\"${command}\",value=\"${boolean_opt}\".*\\^done" \
"\"set ${command} ${boolean_opt}\""
}
mi_gdb_test "set ${command} off" \
"\\&\"set ${command} off\\\\n\"\r\n\\^done" \
"\"set ${command}\" no event"
}
foreach command { "trace-notes" "remote exec-file" } {
foreach str_opt { "foo" "bar" } {
mi_gdb_test "set ${command} ${str_opt}" \
".*=cmd-param-changed,param=\"${command}\",value=\"${str_opt}\".*\\^done" \
"\"set ${command} ${str_opt}\""
}
mi_gdb_test "set ${command} bar" \
"\\&\"set ${command} bar\\\\n\"\r\n(\\&\"warning.*|)\\^done" \
"\"set ${command} bar\" no event"
}
# No notification is emitted for 'maint set' commands.
foreach command { "profile" "show-debug-regs" } {
foreach boolean_opt { "on" "off" } {
mi_gdb_test "maint set ${command} ${boolean_opt}" \
"\\&\"maint set ${command} ${boolean_opt}\\\\n\"\r\n\\^done" \
"\"maint set ${command} ${boolean_opt}\""
}
}
# Full command parameters are included in the notification when a
# abbreviated one is typed.
mi_gdb_test "set ch type on" \
".*=cmd-param-changed,param=\"check type\",value=\"on\".*\\^done" \
"\"set ch type on\""
mi_gdb_exit
}}
test_command_param_changed
return 0

2
gdb/testsuite/gdb.mi/mi-var-rtti.exp
View file

@ -37,7 +37,7 @@ mi_prepare_inline_tests $srcfile
# Enable using RTTI to determine real types of the objects # Enable using RTTI to determine real types of the objects
proc set_print_object {state testname} { proc set_print_object {state testname} {
mi_gdb_test "-interpreter-exec console \"set print object ${state}\"" \ mi_gdb_test "-interpreter-exec console \"set print object ${state}\"" \
{\^done} \ "(.*=cmd-param-changed,param=\"print object\",value=\"${state}\".*|)\\^done" \
"-interpreter-exec console \"set print object ${state}\" in $testname" "-interpreter-exec console \"set print object ${state}\" in $testname"
} }

4
gdb/testsuite/gdb.mi/mi2-cli.exp
View file

@ -69,7 +69,7 @@ set line_callee4_head [gdb_get_line_number "callee4 ("]
set line_callee4_body [expr $line_callee4_head + 2] set line_callee4_body [expr $line_callee4_head + 2]
mi_gdb_test "-interpreter-exec console \"set args foobar\"" \ mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
{\^done} \ ".*=cmd-param-changed,param=\"args\",value=\"foobar\".*\\^done" \
"-interpreter-exec console \"set args foobar\"" "-interpreter-exec console \"set args foobar\""
mi_gdb_test "-interpreter-exec console \"show args\"" \ mi_gdb_test "-interpreter-exec console \"show args\"" \
@ -89,7 +89,7 @@ mi_gdb_test "-interpreter-exec console \"info break\"" \
"-interpreter-exec console \"info break\"" "-interpreter-exec console \"info break\""
mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \ mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
{\^done} \ ".*=cmd-param-changed,param=\"listsize\",value=\"1\".*\\^done" \
"-interpreter-exec console \"set listsize 1\"" "-interpreter-exec console \"set listsize 1\""
# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done } # {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }

5
gdb/testsuite/gdb.mi/mi2-prompt.exp
View file

@ -23,8 +23,9 @@ if [mi_gdb_start] {
# Check console 'set prompt' does not affect the MI output. # Check console 'set prompt' does not affect the MI output.
mi_gdb_test {-interpreter-exec console "set prompt (banana) "} {\^done} \ mi_gdb_test {-interpreter-exec console "set prompt (banana) "} \
"console set prompt" ".*=cmd-param-changed,param=\"prompt\",value=\"\\(banana\\) \".*\\^done" \
"console set prompt"
mi_gdb_test "-break-list" ".*}" "-break-list" mi_gdb_test "-break-list" ".*}" "-break-list"
gdb_exit gdb_exit

6
gdb/top.c
View file

@ -474,8 +474,10 @@ execute_command (char *p, int from_tty)
/* c->user_commands would be NULL in the case of a python command. */ /* c->user_commands would be NULL in the case of a python command. */
if (c->class == class_user && c->user_commands) if (c->class == class_user && c->user_commands)
execute_user_command (c, arg); execute_user_command (c, arg);
else if (c->type == set_cmd || c->type == show_cmd) else if (c->type == set_cmd)
do_setshow_command (arg, from_tty, c); 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)) else if (!cmd_func_p (c))
error (_("That is not a command, just a help topic.")); error (_("That is not a command, just a help topic."));
else if (deprecated_call_command_hook) else if (deprecated_call_command_hook)