/* C preprocessor macro expansion commands for GDB.
- Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2002-2015 Free Software Foundation, Inc.
Contributed by Red Hat, Inc.
This file is part of GDB.
#include "macrotab.h"
#include "macroexp.h"
#include "macroscope.h"
+#include "cli/cli-utils.h"
#include "command.h"
#include "gdbcmd.h"
-#include "gdb_string.h"
+#include "linespec.h"
\f
/* The `macro' prefix command. */
{
printf_unfiltered
("\"macro\" must be followed by the name of a macro command.\n");
- help_list (macrolist, "macro ", -1, gdb_stdout);
+ help_list (macrolist, "macro ", all_commands, gdb_stdout);
}
/* Macro expansion commands. */
+/* Prints an informational message regarding the lack of macro information. */
+static void
+macro_inform_no_debuginfo (void)
+{
+ puts_filtered ("GDB has no preprocessor macro information for that code.\n");
+}
+
static void
macro_expand_command (char *exp, int from_tty)
{
fputs_filtered ("\n", gdb_stdout);
}
else
- fputs_filtered ("GDB has no preprocessor macro information for "
- "that code.\n",
- gdb_stdout);
+ macro_inform_no_debuginfo ();
do_cleanups (cleanup_chain);
return;
fputs_filtered ("\n", gdb_stdout);
}
else
- fputs_filtered ("GDB has no preprocessor macro information for "
- "that code.\n",
- gdb_stdout);
+ macro_inform_no_debuginfo ();
do_cleanups (cleanup_chain);
return;
struct macro_source_file *file,
int line)
{
- fprintf_filtered (stream, "%s:%d\n", file->filename, line);
+ char *fullname;
+
+ fullname = macro_source_fullname (file);
+ fprintf_filtered (stream, "%s:%d\n", fullname, line);
+ xfree (fullname);
while (file->included_by)
{
- fprintf_filtered (gdb_stdout, " included at %s:%d\n",
- file->included_by->filename,
+ fullname = macro_source_fullname (file->included_by);
+ fprintf_filtered (gdb_stdout, " included at %s:%d\n", fullname,
file->included_at_line);
+ xfree (fullname);
file = file->included_by;
}
}
struct macro_source_file *file,
int line)
{
- fprintf_filtered (gdb_stdout, "Defined at ");
- show_pp_source_pos (gdb_stdout, file, line);
-
- if (line != 0)
- fprintf_filtered (gdb_stdout, "#define %s", name);
- else
- fprintf_filtered (gdb_stdout, "-D%s", name);
+ fprintf_filtered (gdb_stdout, "Defined at ");
+ show_pp_source_pos (gdb_stdout, file, line);
- if (d->kind == macro_function_like)
- {
- int i;
-
- fputs_filtered ("(", gdb_stdout);
- for (i = 0; i < d->argc; i++)
- {
- fputs_filtered (d->argv[i], gdb_stdout);
- if (i + 1 < d->argc)
- fputs_filtered (", ", gdb_stdout);
- }
- fputs_filtered (")", gdb_stdout);
- }
-
- if (line != 0)
- fprintf_filtered (gdb_stdout, " %s\n", d->replacement);
- else
- fprintf_filtered (gdb_stdout, "=%s\n", d->replacement);
-}
-
-static void
-info_macro_command (char *name, int from_tty)
-{
- struct macro_scope *ms = NULL;
- struct cleanup *cleanup_chain = make_cleanup (free_current_contents, &ms);
- struct macro_definition *d;
-
- if (! name || ! *name)
- error (_("You must follow the `info macro' command with the name"
- " of the macro\n"
- "whose definition you want to see."));
-
- ms = default_macro_scope ();
- if (! ms)
- error (_("GDB has no preprocessor macro information for that code."));
+ if (line != 0)
+ fprintf_filtered (gdb_stdout, "#define %s", name);
+ else
+ fprintf_filtered (gdb_stdout, "-D%s", name);
- d = macro_lookup_definition (ms->file, ms->line, name);
- if (d)
+ if (d->kind == macro_function_like)
{
- int line;
- struct macro_source_file *file
- = macro_definition_location (ms->file, ms->line, name, &line);
+ int i;
- print_macro_definition (name, d, file, line);
- }
- else
- {
- fprintf_filtered (gdb_stdout,
- "The symbol `%s' has no definition as a C/C++"
- " preprocessor macro\n"
- "at ", name);
- show_pp_source_pos (gdb_stdout, ms->file, ms->line);
+ fputs_filtered ("(", gdb_stdout);
+ for (i = 0; i < d->argc; i++)
+ {
+ fputs_filtered (d->argv[i], gdb_stdout);
+ if (i + 1 < d->argc)
+ fputs_filtered (", ", gdb_stdout);
+ }
+ fputs_filtered (")", gdb_stdout);
}
- do_cleanups (cleanup_chain);
+ if (line != 0)
+ fprintf_filtered (gdb_stdout, " %s\n", d->replacement);
+ else
+ fprintf_filtered (gdb_stdout, "=%s\n", d->replacement);
}
/* A callback function for usage with macro_for_each and friends.
print_macro_definition (name, macro, source, line);
}
-/* Implementation of the "info definitions" command. */
+/* The implementation of the `info macro' command. */
static void
-info_definitions_command (char *name, int from_tty)
+info_macro_command (char *args, int from_tty)
{
struct macro_scope *ms = NULL;
- struct cleanup *cleanup_chain = make_cleanup (free_current_contents, &ms);
+ struct cleanup *cleanup_chain;
+ char *name;
+ int show_all_macros_named = 0;
+ char *arg_start = args;
+ int processing_args = 1;
+
+ while (processing_args
+ && arg_start && *arg_start == '-' && *arg_start != '\0')
+ {
+ char *p = skip_to_space (arg_start);
+
+ if (strncmp (arg_start, "-a", p - arg_start) == 0
+ || strncmp (arg_start, "-all", p - arg_start) == 0)
+ show_all_macros_named = 1;
+ else if (strncmp (arg_start, "--", p - arg_start) == 0)
+ /* Our macro support seems rather C specific but this would
+ seem necessary for languages allowing - in macro names.
+ e.g. Scheme's (defmacro ->foo () "bar\n") */
+ processing_args = 0;
+ else
+ {
+ /* Relies on modified 'args' not making it in to history */
+ *p = '\0';
+ error (_("Unrecognized option '%s' to info macro command. "
+ "Try \"help info macro\"."), arg_start);
+ }
+
+ arg_start = skip_spaces (p);
+ }
+
+ name = arg_start;
if (! name || ! *name)
- error (_("The `info definitions' command requires a macro name as an \
-argument."));
+ error (_("You must follow the `info macro' command with the name"
+ " of the macro\n"
+ "whose definition you want to see."));
ms = default_macro_scope ();
+ cleanup_chain = make_cleanup (free_current_contents, &ms);
- if (! ms || ! ms->file || ! ms->file->table)
- error (_("GDB has no preprocessor macro information for that code."));
+ if (! ms)
+ macro_inform_no_debuginfo ();
+ else if (show_all_macros_named)
+ macro_for_each (ms->file->table, print_macro_callback, name);
+ else
+ {
+ struct macro_definition *d;
+
+ d = macro_lookup_definition (ms->file, ms->line, name);
+ if (d)
+ {
+ int line;
+ struct macro_source_file *file
+ = macro_definition_location (ms->file, ms->line, name, &line);
+
+ print_macro_definition (name, d, file, line);
+ }
+ else
+ {
+ fprintf_filtered (gdb_stdout,
+ "The symbol `%s' has no definition as a C/C++"
+ " preprocessor macro\n"
+ "at ", name);
+ show_pp_source_pos (gdb_stdout, ms->file, ms->line);
+ }
+ }
- macro_for_each (ms->file->table, print_macro_callback, name);
do_cleanups (cleanup_chain);
}
ms = default_macro_scope ();
else
{
- struct symtabs_and_lines sals = decode_line_spec (args, 0);
+ struct symtabs_and_lines sals =
+ decode_line_with_current_source (args, 0);
if (sals.nelts)
ms = sal_macro_scope (sals.sals[0]);
}
if (! ms || ! ms->file || ! ms->file->table)
- error (_("GDB has no preprocessor macro information for that code."));
+ macro_inform_no_debuginfo ();
+ else
+ macro_for_each_in_scope (ms->file, ms->line, print_macro_callback, NULL);
- macro_for_each_in_scope (ms->file, ms->line, print_macro_callback, NULL);
do_cleanups (cleanup_chain);
}
char *p = *expp;
unsigned int len;
- if (is_parameter && !strncmp (p, "...", 3))
+ if (is_parameter && startswith (p, "..."))
{
/* Ok. */
}
;
}
- if (is_parameter && !strncmp (p, "...", 3))
+ if (is_parameter && startswith (p, "..."))
p += 3;
len = p - *expp;
{
/* Function-like macro. */
int alloced = 5;
- char **argv = (char **) xmalloc (alloced * sizeof (char *));
+ char **argv = XNEWVEC (char *, alloced);
new_macro.kind = macro_function_like;
new_macro.argc = 0;
add_alias_cmd ("exp1", "expand-once", no_class, 1, ¯olist);
add_cmd ("macro", no_class, info_macro_command,
- _("Show the definition of MACRO, and its source location."),
+ _("Show the definition of MACRO, and it's source location.\n\
+Usage: info macro [-a|-all] [--] MACRO\n\
+Options: \n\
+ -a, --all Output all definitions of MACRO in the current compilation\
+ unit.\n\
+ -- Specify the end of arguments and the beginning of the MACRO."),
+
&infolist);
add_cmd ("macros", no_class, info_macros_command,
Usage: info macros [LINESPEC]"),
&infolist);
- add_cmd ("definitions", no_class, info_definitions_command,
- _("Show all definitions of MACRO in the current compilation unit.\n\
-Usage: info definitions MACRO"),
- &infolist);
-
add_cmd ("define", no_class, macro_define_command, _("\
Define a new C/C++ preprocessor macro.\n\
The GDB command `macro define DEFINITION' is equivalent to placing a\n\