X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmacrocmd.c;h=42915db904423932cedbdceeb9412dabecb54537;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=0ec8f822870229e4e80931580f087089d86b0a12;hpb=1d12d88f186fe1ae66deccf877b5509c506c4d39;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c index 0ec8f82287..42915db904 100644 --- a/gdb/macrocmd.c +++ b/gdb/macrocmd.c @@ -1,5 +1,5 @@ /* C preprocessor macro expansion commands for GDB. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. Contributed by Red Hat, Inc. This file is part of GDB. @@ -22,6 +22,7 @@ #include "macrotab.h" #include "macroexp.h" #include "macroscope.h" +#include "cli/cli-style.h" #include "cli/cli-utils.h" #include "command.h" #include "gdbcmd.h" @@ -32,15 +33,6 @@ static struct cmd_list_element *macrolist; -static void -macro_command (const char *arg, int from_tty) -{ - printf_unfiltered - ("\"macro\" must be followed by the name of a macro command.\n"); - help_list (macrolist, "macro ", all_commands, gdb_stdout); -} - - /* Macro expansion commands. */ @@ -55,11 +47,8 @@ macro_inform_no_debuginfo (void) static void macro_expand_command (const char *exp, int from_tty) { - struct macro_scope *ms = NULL; - char *expanded = NULL; - struct cleanup *cleanup_chain = make_cleanup (free_current_contents, &ms); - - make_cleanup (free_current_contents, &expanded); + gdb::unique_xmalloc_ptr ms; + gdb::unique_xmalloc_ptr expanded; /* You know, when the user doesn't specify any expression, it would be really cool if this defaulted to the last expression evaluated. @@ -74,26 +63,21 @@ macro_expand_command (const char *exp, int from_tty) ms = default_macro_scope (); if (ms) { - expanded = macro_expand (exp, standard_macro_lookup, ms); + expanded = macro_expand (exp, standard_macro_lookup, ms.get ()); fputs_filtered ("expands to: ", gdb_stdout); - fputs_filtered (expanded, gdb_stdout); + fputs_filtered (expanded.get (), gdb_stdout); fputs_filtered ("\n", gdb_stdout); } else macro_inform_no_debuginfo (); - - do_cleanups (cleanup_chain); - return; } static void macro_expand_once_command (const char *exp, int from_tty) { - struct macro_scope *ms = NULL; - char *expanded = NULL; - struct cleanup *cleanup_chain = make_cleanup (free_current_contents, &ms); - make_cleanup (free_current_contents, &expanded); + gdb::unique_xmalloc_ptr ms; + gdb::unique_xmalloc_ptr expanded; /* You know, when the user doesn't specify any expression, it would be really cool if this defaulted to the last expression evaluated. @@ -108,16 +92,13 @@ macro_expand_once_command (const char *exp, int from_tty) ms = default_macro_scope (); if (ms) { - expanded = macro_expand_once (exp, standard_macro_lookup, ms); + expanded = macro_expand_once (exp, standard_macro_lookup, ms.get ()); fputs_filtered ("expands to: ", gdb_stdout); - fputs_filtered (expanded, gdb_stdout); + fputs_filtered (expanded.get (), gdb_stdout); fputs_filtered ("\n", gdb_stdout); } else macro_inform_no_debuginfo (); - - do_cleanups (cleanup_chain); - return; } /* Outputs the include path of a macro starting at FILE and LINE to STREAM. @@ -129,18 +110,18 @@ show_pp_source_pos (struct ui_file *stream, struct macro_source_file *file, int line) { - char *fullname; - - fullname = macro_source_fullname (file); - fprintf_filtered (stream, "%s:%d\n", fullname, line); - xfree (fullname); + std::string fullname = macro_source_fullname (file); + fprintf_filtered (stream, "%ps:%d\n", + styled_string (file_name_style.style (), + fullname.c_str ()), + line); while (file->included_by) { fullname = macro_source_fullname (file->included_by); - fprintf_filtered (gdb_stdout, " included at %s:%d\n", fullname, - file->included_at_line); - xfree (fullname); + fputs_filtered (_(" included at "), stream); + fputs_styled (fullname.c_str (), file_name_style.style (), stream); + fprintf_filtered (stream, ":%d\n", file->included_at_line); file = file->included_by; } } @@ -190,8 +171,7 @@ print_macro_definition (const char *name, static void info_macro_command (const char *args, int from_tty) { - struct macro_scope *ms = NULL; - struct cleanup *cleanup_chain; + gdb::unique_xmalloc_ptr ms; const char *name; int show_all_macros_named = 0; const char *arg_start = args; @@ -211,13 +191,9 @@ info_macro_command (const char *args, int from_tty) e.g. Scheme's (defmacro ->foo () "bar\n") */ processing_args = 0; else - { - error (_("Unrecognized option '%.*s' to info macro command. " - "Try \"help info macro\"."), - int (p - arg_start), arg_start); - } + report_unrecognized_option_error ("info macro", arg_start); - arg_start = skip_spaces (p); + arg_start = skip_spaces (p); } name = arg_start; @@ -228,7 +204,6 @@ info_macro_command (const char *args, int from_tty) "whose definition you want to see.")); ms = default_macro_scope (); - cleanup_chain = make_cleanup (free_current_contents, &ms); if (! ms) macro_inform_no_debuginfo (); @@ -263,16 +238,13 @@ info_macro_command (const char *args, int from_tty) show_pp_source_pos (gdb_stdout, ms->file, ms->line); } } - - do_cleanups (cleanup_chain); } /* Implementation of the "info macros" command. */ static void info_macros_command (const char *args, int from_tty) { - struct macro_scope *ms = NULL; - struct cleanup *cleanup_chain = make_cleanup (free_current_contents, &ms); + gdb::unique_xmalloc_ptr ms; if (args == NULL) ms = default_macro_scope (); @@ -289,8 +261,6 @@ info_macros_command (const char *args, int from_tty) macro_inform_no_debuginfo (); else macro_for_each_in_scope (ms->file, ms->line, print_macro_definition); - - do_cleanups (cleanup_chain); } @@ -310,7 +280,7 @@ skip_ws (const char **expp) function will also allow "..." forms as used in varargs macro parameters. */ -static char * +static gdb::unique_xmalloc_ptr extract_identifier (const char **expp, int is_parameter) { char *result; @@ -339,41 +309,42 @@ extract_identifier (const char **expp, int is_parameter) memcpy (result, *expp, len); result[len] = '\0'; *expp += len; - return result; + return gdb::unique_xmalloc_ptr (result); } -/* Helper function to clean up a temporarily-constructed macro object. - This assumes that the contents were all allocated with xmalloc. */ -static void -free_macro_definition_ptr (void *ptr) +struct temporary_macro_definition : public macro_definition { - int i; - struct macro_definition *loc = (struct macro_definition *) ptr; - - for (i = 0; i < loc->argc; ++i) - xfree ((char *) loc->argv[i]); - xfree ((char *) loc->argv); - /* Note that the 'replacement' field is not allocated. */ -} + temporary_macro_definition () + { + table = nullptr; + kind = macro_object_like; + argc = 0; + argv = nullptr; + replacement = nullptr; + } + + ~temporary_macro_definition () + { + int i; + + for (i = 0; i < argc; ++i) + xfree ((char *) argv[i]); + xfree ((char *) argv); + /* Note that the 'replacement' field is not allocated. */ + } +}; static void macro_define_command (const char *exp, int from_tty) { - struct macro_definition new_macro; - char *name = NULL; - struct cleanup *cleanup_chain; + temporary_macro_definition new_macro; if (!exp) error (_("usage: macro define NAME[(ARGUMENT-LIST)] [REPLACEMENT-LIST]")); - cleanup_chain = make_cleanup (free_macro_definition_ptr, &new_macro); - make_cleanup (free_current_contents, &name); - - memset (&new_macro, 0, sizeof (struct macro_definition)); - skip_ws (&exp); - name = extract_identifier (&exp, 0); - if (! name) + gdb::unique_xmalloc_ptr name = extract_identifier (&exp, 0); + if (name == NULL) error (_("Invalid macro name.")); if (*exp == '(') { @@ -400,7 +371,7 @@ macro_define_command (const char *exp, int from_tty) /* Must update new_macro as well... */ new_macro.argv = (const char * const *) argv; } - argv[new_macro.argc] = extract_identifier (&exp, 1); + argv[new_macro.argc] = extract_identifier (&exp, 1).release (); if (! argv[new_macro.argc]) error (_("Macro is missing an argument.")); ++new_macro.argc; @@ -424,34 +395,30 @@ macro_define_command (const char *exp, int from_tty) ++exp; skip_ws (&exp); - macro_define_function (macro_main (macro_user_macros), -1, name, + macro_define_function (macro_main (macro_user_macros), -1, name.get (), new_macro.argc, (const char **) new_macro.argv, exp); } else { skip_ws (&exp); - macro_define_object (macro_main (macro_user_macros), -1, name, exp); + macro_define_object (macro_main (macro_user_macros), -1, name.get (), + exp); } - - do_cleanups (cleanup_chain); } static void macro_undef_command (const char *exp, int from_tty) { - char *name; - if (!exp) error (_("usage: macro undef NAME")); skip_ws (&exp); - name = extract_identifier (&exp, 0); - if (! name) + gdb::unique_xmalloc_ptr name = extract_identifier (&exp, 0); + if (name == nullptr) error (_("Invalid macro name.")); - macro_undef (macro_main (macro_user_macros), -1, name); - xfree (name); + macro_undef (macro_main (macro_user_macros), -1, name.get ()); } @@ -482,14 +449,15 @@ macro_list_command (const char *exp, int from_tty) /* Initializing the `macrocmd' module. */ +void _initialize_macrocmd (); void -_initialize_macrocmd (void) +_initialize_macrocmd () { /* We introduce a new command prefix, `macro', under which we'll put the various commands for working with preprocessor macros. */ - add_prefix_cmd ("macro", class_info, macro_command, - _("Prefix for commands dealing with C preprocessor macros."), - ¯olist, "macro ", 0, &cmdlist); + add_basic_prefix_cmd ("macro", class_info, + _("Prefix for commands dealing with C preprocessor macros."), + ¯olist, "macro ", 0, &cmdlist); add_cmd ("expand", no_class, macro_expand_command, _("\ Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n\