a79b8f6ea8
* breakpoint.c (clear_syscall_counts): Take struct inferior*. * inferior.c (add_inferior_silent): Notify inferior_added observer. (delete_inferior_1): Notify inferior_removed observer. (exit_inferior_1): Pass inferior, not pid, to observer. (inferior_appeared): Likewise. (add_inferior_with_spaces): New. (add_inferior_command): Use the above. * inferior.h (delete_inferior_1, add_inferior_with_spaces): Declare. * inflow.c (inflow_inferior_exit): Likewise. * jit.c (jit_inferior_exit_hook): Likewise. * mi/mi-cmds.c (mi_cmds): Register add-inferior and remove-inferior. * mi/mi-cmds.h (mi_cmd_add_inferior, mi_cmd_remove_inferior): New. * mi/mi-interp.c (mi_inferior_added, mi_inferior_removed): New. (report_initial_inferior): New. (mi_inferior_removed): Register the above. Make sure inferior_added observer is called on the first inferior. (mi_new_thread, mi_thread_exit): Thread group is now identified by inferior number, not pid. (mi_solib_loaded, mi_solib_unloaded): Report which inferiors are affected. * mi/mi-main.c (current_context): New. (proceed_thread_callback): Use typed closure. Proceed everything if pid is 0. Most implementation split into (proceed_thread): ... this. (run_one_inferior): New. (mi_cmd_exec_continue, mi_cmd_exec_interrupt, mi_cmd_exec_run): Adjust for multiexec behaviour. (mi_cmd_add_inferior, mi_cmd_remove_inferior): New. (mi_cmd_execute): Handle the 'thread-group' option here. Do some extra checks. * mi-parse.c (mi_parse): Handle the --all and --thread-group options. * mi-parse.h (struct mi_parse): New fields all and thread_group.
291 lines
7.0 KiB
C
291 lines
7.0 KiB
C
/* MI Command Set - MI parser.
|
|
|
|
Copyright (C) 2000, 2001, 2002, 2007, 2008, 2009, 2010
|
|
Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
This file is part of GDB.
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "mi-cmds.h"
|
|
#include "mi-parse.h"
|
|
|
|
#include <ctype.h>
|
|
#include "gdb_string.h"
|
|
|
|
static void
|
|
mi_parse_argv (char *args, struct mi_parse *parse)
|
|
{
|
|
char *chp = args;
|
|
int argc = 0;
|
|
char **argv = xmalloc ((argc + 1) * sizeof (char *));
|
|
argv[argc] = NULL;
|
|
while (1)
|
|
{
|
|
char *arg;
|
|
/* skip leading white space */
|
|
while (isspace (*chp))
|
|
chp++;
|
|
/* Three possibilities: EOF, quoted string, or other text. */
|
|
switch (*chp)
|
|
{
|
|
case '\0':
|
|
parse->argv = argv;
|
|
parse->argc = argc;
|
|
return;
|
|
case '"':
|
|
{
|
|
/* A quoted string. */
|
|
int len;
|
|
char *start = chp + 1;
|
|
/* Determine the buffer size. */
|
|
chp = start;
|
|
len = 0;
|
|
while (*chp != '\0' && *chp != '"')
|
|
{
|
|
if (*chp == '\\')
|
|
{
|
|
chp++;
|
|
if (parse_escape (&chp) <= 0)
|
|
{
|
|
/* Do not allow split lines or "\000" */
|
|
freeargv (argv);
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
chp++;
|
|
len++;
|
|
}
|
|
/* Insist on a closing quote. */
|
|
if (*chp != '"')
|
|
{
|
|
freeargv (argv);
|
|
return;
|
|
}
|
|
/* Insist on trailing white space. */
|
|
if (chp[1] != '\0' && !isspace (chp[1]))
|
|
{
|
|
freeargv (argv);
|
|
return;
|
|
}
|
|
/* create the buffer. */
|
|
arg = xmalloc ((len + 1) * sizeof (char));
|
|
/* And copy the characters in. */
|
|
chp = start;
|
|
len = 0;
|
|
while (*chp != '\0' && *chp != '"')
|
|
{
|
|
if (*chp == '\\')
|
|
{
|
|
chp++;
|
|
arg[len] = parse_escape (&chp);
|
|
}
|
|
else
|
|
arg[len] = *chp++;
|
|
len++;
|
|
}
|
|
arg[len] = '\0';
|
|
chp++; /* that closing quote. */
|
|
break;
|
|
}
|
|
default:
|
|
{
|
|
/* An unquoted string. Accumulate all non blank
|
|
characters into a buffer. */
|
|
int len;
|
|
char *start = chp;
|
|
while (*chp != '\0' && !isspace (*chp))
|
|
{
|
|
chp++;
|
|
}
|
|
len = chp - start;
|
|
arg = xmalloc ((len + 1) * sizeof (char));
|
|
strncpy (arg, start, len);
|
|
arg[len] = '\0';
|
|
break;
|
|
}
|
|
}
|
|
/* Append arg to argv. */
|
|
argv = xrealloc (argv, (argc + 2) * sizeof (char *));
|
|
argv[argc++] = arg;
|
|
argv[argc] = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
mi_parse_free (struct mi_parse *parse)
|
|
{
|
|
if (parse == NULL)
|
|
return;
|
|
if (parse->command != NULL)
|
|
xfree (parse->command);
|
|
if (parse->token != NULL)
|
|
xfree (parse->token);
|
|
if (parse->args != NULL)
|
|
xfree (parse->args);
|
|
if (parse->argv != NULL)
|
|
freeargv (parse->argv);
|
|
xfree (parse);
|
|
}
|
|
|
|
|
|
struct mi_parse *
|
|
mi_parse (char *cmd)
|
|
{
|
|
char *chp;
|
|
struct mi_parse *parse = XMALLOC (struct mi_parse);
|
|
memset (parse, 0, sizeof (*parse));
|
|
parse->all = 0;
|
|
parse->thread_group = -1;
|
|
parse->thread = -1;
|
|
parse->frame = -1;
|
|
|
|
/* Before starting, skip leading white space. */
|
|
while (isspace (*cmd))
|
|
cmd++;
|
|
|
|
/* Find/skip any token and then extract it. */
|
|
for (chp = cmd; *chp >= '0' && *chp <= '9'; chp++)
|
|
;
|
|
parse->token = xmalloc ((chp - cmd + 1) * sizeof (char *));
|
|
memcpy (parse->token, cmd, (chp - cmd));
|
|
parse->token[chp - cmd] = '\0';
|
|
|
|
/* This wasn't a real MI command. Return it as a CLI_COMMAND. */
|
|
if (*chp != '-')
|
|
{
|
|
while (isspace (*chp))
|
|
chp++;
|
|
parse->command = xstrdup (chp);
|
|
parse->op = CLI_COMMAND;
|
|
return parse;
|
|
}
|
|
|
|
/* Extract the command. */
|
|
{
|
|
char *tmp = chp + 1; /* discard ``-'' */
|
|
for (; *chp && !isspace (*chp); chp++)
|
|
;
|
|
parse->command = xmalloc ((chp - tmp + 1) * sizeof (char *));
|
|
memcpy (parse->command, tmp, chp - tmp);
|
|
parse->command[chp - tmp] = '\0';
|
|
}
|
|
|
|
/* Find the command in the MI table. */
|
|
parse->cmd = mi_lookup (parse->command);
|
|
if (parse->cmd == NULL)
|
|
{
|
|
/* FIXME: This should be a function call. */
|
|
fprintf_unfiltered
|
|
(raw_stdout,
|
|
"%s^error,msg=\"Undefined MI command: %s\"\n",
|
|
parse->token, parse->command);
|
|
mi_parse_free (parse);
|
|
return NULL;
|
|
}
|
|
|
|
/* Skip white space following the command. */
|
|
while (isspace (*chp))
|
|
chp++;
|
|
|
|
/* Parse the --thread and --frame options, if present. At present,
|
|
some important commands, like '-break-*' are implemented by forwarding
|
|
to the CLI layer directly. We want to parse --thread and --frame
|
|
here, so as not to leave those option in the string that will be passed
|
|
to CLI. */
|
|
for (;;)
|
|
{
|
|
char *start = chp;
|
|
size_t as = sizeof ("--all ") - 1;
|
|
size_t tgs = sizeof ("--thread-group ") - 1;
|
|
size_t ts = sizeof ("--thread ") - 1;
|
|
size_t fs = sizeof ("--frame ") - 1;
|
|
if (strncmp (chp, "--all ", as) == 0)
|
|
{
|
|
parse->all = 1;
|
|
chp += as;
|
|
}
|
|
/* See if --all is the last token in the input. */
|
|
if (strcmp (chp, "--all") == 0)
|
|
{
|
|
parse->all = 1;
|
|
chp += strlen (chp);
|
|
}
|
|
if (strncmp (chp, "--thread-group ", tgs) == 0)
|
|
{
|
|
if (parse->thread_group != -1)
|
|
error (_("Duplicate '--thread-group' option"));
|
|
chp += tgs;
|
|
if (*chp != 'i')
|
|
error (_("Invalid thread group id"));
|
|
chp += 1;
|
|
parse->thread_group = strtol (chp, &chp, 10);
|
|
}
|
|
if (strncmp (chp, "--thread ", ts) == 0)
|
|
{
|
|
if (parse->thread != -1)
|
|
error (_("Duplicate '--thread' option"));
|
|
chp += ts;
|
|
parse->thread = strtol (chp, &chp, 10);
|
|
}
|
|
else if (strncmp (chp, "--frame ", fs) == 0)
|
|
{
|
|
if (parse->frame != -1)
|
|
error (_("Duplicate '--frame' option"));
|
|
chp += fs;
|
|
parse->frame = strtol (chp, &chp, 10);
|
|
}
|
|
else
|
|
break;
|
|
|
|
if (*chp != '\0' && !isspace (*chp))
|
|
error (_("Invalid value for the '%s' option"),
|
|
start[2] == 't' ? "--thread" : "--frame");
|
|
while (isspace (*chp))
|
|
chp++;
|
|
}
|
|
|
|
/* For new argv commands, attempt to return the parsed argument
|
|
list. */
|
|
if (parse->cmd->argv_func != NULL)
|
|
{
|
|
mi_parse_argv (chp, parse);
|
|
if (parse->argv == NULL)
|
|
{
|
|
/* FIXME: This should be a function call. */
|
|
fprintf_unfiltered
|
|
(raw_stdout,
|
|
"%s^error,msg=\"Problem parsing arguments: %s %s\"\n",
|
|
parse->token, parse->command, chp);
|
|
mi_parse_free (parse);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* FIXME: DELETE THIS */
|
|
/* For CLI commands, also return the remainder of the
|
|
command line as a single string. */
|
|
if (parse->cmd->cli.cmd != NULL)
|
|
parse->args = xstrdup (chp);
|
|
|
|
/* Fully parsed. */
|
|
parse->op = MI_COMMAND;
|
|
return parse;
|
|
}
|