b9362cc7a8
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen from GCC's acinclude.m4. * configure.in: Check for getopt's delcaration. * aclocal.m4, config.in, configure: Re-generate. * main.c (error_init): Delete declaration. * defs.h (error_init): Declare. * rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static. (rs6000_convert_from_func_ptr_addr): Make static. (_initialize_rs6000_tdep): Add declaration. * cli/cli-cmds.c (dont_repeat): Delete declaration. (show_commands, set_verbose, show_history): Delete declaration. * top.h (set_verbose): Add declaration. (show_history, set_history, show_commands): Add declaration. (do_restore_instream_cleanup): Add declaration. * objc-lang.c (specialcmp): Make static. (print_object_command): Make static. (find_objc_msgsend): Make static. (find_objc_msgcall_submethod_helper): Make static. (find_objc_msgcall_submethod): Make static. (_initialize_objc_language): Add declaration. (find_implementation_from_class): Make static. (find_implementation): Make static. * objc-exp.y (yylex): Delete lookup_struct_typedef declaration. * objc-lang.h (lookup_struct_typedef): Add declaration. * cli/cli-interp.c (_initialize_cli_interp): Add declaration. * cli/cli-script.c (clear_hook_in_cleanup): Make static. (do_restore_user_call_depth): Make static. (do_restore_instream_cleanup): Delete declaration. (dont_repeat): Delete declaration. * cli/cli-decode.c (add_abbrev_cmd): Delete function. * cli/cli-dump.c (_initialize_cli_dump): Add declaration. * reggroups.c (_initialize_reggroup): Add declaration. * cp-support.c (_initialize_cp_support): Add declaration. * cp-abi.c (_initialize_cp_abi): Add declaration. * hpacc-abi.c (_initialize_hpacc_abi): Add declaration. * gnu-v3-abi.c (gnuv3_baseclass_offset): Make static. (_initialize_gnu_v3_abi): Add declaration. * gnu-v2-abi.c (gnuv2_value_rtti_type): Make static. (_initialize_gnu_v2_abi): Add declaration. * frame-base.c (_initialize_frame_base): Add declaration. * doublest.c (floatformat_from_length): Make static. * frame-unwind.c (_initialize_frame_unwind): Add declaration. * frame.c (create_sentinel_frame): Make static. (_initialize_frame): Add declaration. * top.c (do_catch_errors): Make static. (gdb_rl_operate_and_get_next_completion): Make static. * typeprint.c: Include "typeprint.h". * sentinel-frame.c (sentinel_frame_prev_register): Make static. (sentinel_frame_this_id): Make static. * p-valprint.c (_initialize_pascal_valprint): Add declaration. * ui-out.c (make_cleanup_ui_out_begin_end): Delete function. * dwarf2-frame.c (dwarf2_frame_cache): Make static. * p-exp.y (push_current_type, pop_current_type): ISO C declaration. * dwarf2expr.h (dwarf_expr_context): ISO C declaration. * maint.c (maintenance_print_architecture): Make static. * signals/signals.c (_initialize_signals): Add declaration. * std-regs.c (_initialize_frame_reg): Add declaration. * jv-exp.y (push_variable): ISO C definition. (push_qualified_expression_name): Ditto. * memattr.c (_initialize_mem): Add declaration. * remote.c (remote_check_watch_resources): Make static. (remote_stopped_by_watchpoint): Make static. (remote_stopped_data_address): Make static. * d10v-tdep.c (nr_dmap_regs): Make static. (a0_regnum): Make static. (d10v_frame_unwind_cache): Make static. (d10v_frame_p): Make static. * osabi.c (show_osabi): Make static. (_initialize_gdb_osabi): Add extern declaration. * gdbtypes.c (make_qualified_type): Make static. (safe_parse_type): Make static. * macrocmd.c (_initialize_macrocmd): Add extern declaration. * macrotab.c (macro_bcache_free): Make static. * interps.c (interp_set_quiet): Make static. (interpreter_exec_cmd): Make static. * stack.h (select_frame_command): New file. * stack.c: Include "stack.h". (select_frame_command_wrapper): Delete function. (select_frame_command): Make global. * infcall.c: Include "infcall.h". * linespec.c: Include "linespec.h". * symfile.c (sections_overlap): Make static. * cp-support.h (cp_initialize_namespace): ISO C declaration. * charset.c (_initialize_charset): Add missing prototype. * regcache.c (init_legacy_regcache_descr): Make static. (do_regcache_xfree): Make static. (regcache_xfer_part): Make static. (_initialize_regcache): Add missing prototype. * breakpoint.c (parse_breakpoint_sals): Make static. (breakpoint_sals_to_pc): Make static. * interps.h (clear_interpreter_hooks): ISO C declaration. * Makefile.in (stack_h): Define. (stack.o, typeprint.o, mi-main.o): Update dependencies. (mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies. Index: mi/ChangeLog 2003-06-08 Andrew Cagney <cagney@redhat.com> * mi-parse.c (_initialize_mi_parse): Delete function. * mi-main.c: Include "mi-main.h". * mi-interp.c (_initialize_mi_interp): Add declaration. * mi-cmd-stack.c: Include "stack.h". (select_frame_command_wrapper): Delete extern declaration. (mi_cmd_stack_select_frame): Replace select_frame_command_wrapper with select_frame_command.
233 lines
5.4 KiB
C
233 lines
5.4 KiB
C
/* MI Command Set - MI parser.
|
|
|
|
Copyright 2000, 2001, 2002 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 2 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, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#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));
|
|
|
|
/* 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++;
|
|
|
|
/* 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 and old ARGS commands, also return the remainder of the
|
|
command line as a single string. */
|
|
if (parse->cmd->args_func != NULL
|
|
|| parse->cmd->cli != NULL)
|
|
{
|
|
parse->args = xstrdup (chp);
|
|
}
|
|
|
|
/* Fully parsed. */
|
|
parse->op = MI_COMMAND;
|
|
return parse;
|
|
}
|