X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmaint.c;h=a8a1fcbc29968f98208690c27a67c4ccd08d3ad0;hb=10eaee5f56611ce5f92ccd305849c0cc6addd130;hp=18a804a955a9f0b98083668292f7ad135b4ed876;hpb=8625fc1bbae9c0c26859f3f6b2111f737d897d15;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/maint.c b/gdb/maint.c index 18a804a955..a8a1fcbc29 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -1,6 +1,6 @@ /* Support for GDB maintenance commands. - Copyright (C) 1992-2013 Free Software Foundation, Inc. + Copyright (C) 1992-2018 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support. @@ -24,8 +24,6 @@ #include "arch-utils.h" #include #include -#include -#include #include "command.h" #include "gdbcmd.h" #include "symtab.h" @@ -38,34 +36,15 @@ #include "symfile.h" #include "objfiles.h" #include "value.h" -#include "gdb_assert.h" #include "top.h" -#include "timeval-utils.h" #include "maint.h" +#include "selftest.h" #include "cli/cli-decode.h" #include "cli/cli-utils.h" #include "cli/cli-setshow.h" -extern void _initialize_maint_cmds (void); - -static void maintenance_command (char *, int); - -static void maintenance_internal_error (char *args, int from_tty); - -static void maintenance_demangle (char *, int); - -static void maintenance_time_display (char *, int); - -static void maintenance_space_display (char *, int); - -static void maintenance_info_command (char *, int); - -static void maintenance_info_sections (char *, int); - -static void maintenance_print_command (char *, int); - -static void maintenance_do_deprecate (char *, int); +static void maintenance_do_deprecate (const char *, int); /* Set this to the maximum number of seconds to wait instead of waiting forever in target_wait(). If this timer times out, then it generates an error and @@ -84,16 +63,16 @@ show_watchdog (struct ui_file *file, int from_tty, /* Access the maintenance subcommands. */ static void -maintenance_command (char *args, int from_tty) +maintenance_command (const char *args, int from_tty) { printf_unfiltered (_("\"maintenance\" must be followed by " "the name of a maintenance command.\n")); - help_list (maintenancelist, "maintenance ", -1, gdb_stdout); + help_list (maintenancelist, "maintenance ", all_commands, gdb_stdout); } #ifndef _WIN32 static void -maintenance_dump_me (char *args, int from_tty) +maintenance_dump_me (const char *args, int from_tty) { if (query (_("Should GDB dump core? "))) { @@ -115,7 +94,7 @@ maintenance_dump_me (char *args, int from_tty) GDB. */ static void -maintenance_internal_error (char *args, int from_tty) +maintenance_internal_error (const char *args, int from_tty) { internal_error (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); } @@ -126,47 +105,32 @@ maintenance_internal_error (char *args, int from_tty) GDB. */ static void -maintenance_internal_warning (char *args, int from_tty) +maintenance_internal_warning (const char *args, int from_tty) { internal_warning (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); } -/* Someday we should allow demangling for things other than just - explicit strings. For example, we might want to be able to specify - the address of a string in either GDB's process space or the - debuggee's process space, and have gdb fetch and demangle that - string. If we have a char* pointer "ptr" that points to a string, - we might want to be able to given just the name and have GDB - demangle and print what it points to, etc. (FIXME) */ +/* Stimulate the internal error mechanism that GDB uses when an + demangler problem is detected. Allows testing of the mechanism. */ static void -maintenance_demangle (char *args, int from_tty) +maintenance_demangler_warning (const char *args, int from_tty) { - char *demangled; + demangler_warning (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); +} - if (args == NULL || *args == '\0') - { - printf_unfiltered (_("\"maintenance demangle\" takes " - "an argument to demangle.\n")); - } - else - { - demangled = language_demangle (current_language, args, - DMGL_ANSI | DMGL_PARAMS); - if (demangled != NULL) - { - printf_unfiltered ("%s\n", demangled); - xfree (demangled); - } - else - { - printf_unfiltered (_("Can't demangle \"%s\"\n"), args); - } - } +/* Old command to demangle a string. The command has been moved to "demangle". + It is kept for now because otherwise "mt demangle" gets interpreted as + "mt demangler-warning" which artificially creates an internal gdb error. */ + +static void +maintenance_demangle (const char *args, int from_tty) +{ + printf_filtered (_("This command has been moved to \"demangle\".\n")); } static void -maintenance_time_display (char *args, int from_tty) +maintenance_time_display (const char *args, int from_tty) { if (args == NULL || *args == '\0') printf_unfiltered (_("\"maintenance time\" takes a numeric argument.\n")); @@ -175,7 +139,7 @@ maintenance_time_display (char *args, int from_tty) } static void -maintenance_space_display (char *args, int from_tty) +maintenance_space_display (const char *args, int from_tty) { if (args == NULL || *args == '\0') printf_unfiltered ("\"maintenance space\" takes a numeric argument.\n"); @@ -188,11 +152,25 @@ maintenance_space_display (char *args, int from_tty) "maintenance info" with no args. */ static void -maintenance_info_command (char *arg, int from_tty) +maintenance_info_command (const char *arg, int from_tty) { printf_unfiltered (_("\"maintenance info\" must be followed " "by the name of an info command.\n")); - help_list (maintenanceinfolist, "maintenance info ", -1, gdb_stdout); + help_list (maintenanceinfolist, "maintenance info ", all_commands, + gdb_stdout); +} + +/* The "maintenance check" command is defined as a prefix, with + allow_unknown 0. Therefore, its own definition is called only for + "maintenance check" with no args. */ + +static void +maintenance_check_command (const char *arg, int from_tty) +{ + printf_unfiltered (_("\"maintenance check\" must be followed " + "by the name of a check command.\n")); + help_list (maintenancechecklist, "maintenance check ", all_commands, + gdb_stdout); } /* Mini tokenizing lexer for 'maint info sections' command. */ @@ -226,7 +204,7 @@ match_substring (const char *string, const char *substr) } static int -match_bfd_flags (char *string, flagword flags) +match_bfd_flags (const char *string, flagword flags) { if (flags & SEC_ALLOC) if (match_substring (string, "ALLOC")) @@ -314,14 +292,15 @@ maint_print_section_info (const char *name, flagword flags, static void print_bfd_section_info (bfd *abfd, asection *asect, - void *arg) + void *datum) { flagword flags = bfd_get_section_flags (abfd, asect); const char *name = bfd_section_name (abfd, asect); + const char *arg = (const char *) datum; - if (arg == NULL || *((char *) arg) == '\0' - || match_substring ((char *) arg, name) - || match_bfd_flags ((char *) arg, flags)) + if (arg == NULL || *arg == '\0' + || match_substring (arg, name) + || match_bfd_flags (arg, flags)) { struct gdbarch *gdbarch = gdbarch_from_bfd (abfd); int addr_size = gdbarch_addr_bit (gdbarch) / 8; @@ -338,7 +317,7 @@ print_bfd_section_info (bfd *abfd, static void print_objfile_section_info (bfd *abfd, struct obj_section *asect, - char *string) + const char *string) { flagword flags = bfd_get_section_flags (abfd, asect->the_bfd_section); const char *name = bfd_section_name (abfd, asect->the_bfd_section); @@ -359,7 +338,7 @@ print_objfile_section_info (bfd *abfd, } static void -maintenance_info_sections (char *arg, int from_tty) +maintenance_info_sections (const char *arg, int from_tty) { if (exec_bfd) { @@ -390,7 +369,7 @@ maintenance_info_sections (char *arg, int from_tty) } } else - bfd_map_over_sections (exec_bfd, print_bfd_section_info, arg); + bfd_map_over_sections (exec_bfd, print_bfd_section_info, (void *) arg); } if (core_bfd) @@ -399,19 +378,19 @@ maintenance_info_sections (char *arg, int from_tty) printf_filtered (" `%s', ", bfd_get_filename (core_bfd)); wrap_here (" "); printf_filtered (_("file type %s.\n"), bfd_get_target (core_bfd)); - bfd_map_over_sections (core_bfd, print_bfd_section_info, arg); + bfd_map_over_sections (core_bfd, print_bfd_section_info, (void *) arg); } } static void -maintenance_print_statistics (char *args, int from_tty) +maintenance_print_statistics (const char *args, int from_tty) { print_objfile_statistics (); print_symbol_bcache_statistics (); } static void -maintenance_print_architecture (char *args, int from_tty) +maintenance_print_architecture (const char *args, int from_tty) { struct gdbarch *gdbarch = get_current_arch (); @@ -419,14 +398,11 @@ maintenance_print_architecture (char *args, int from_tty) gdbarch_dump (gdbarch, gdb_stdout); else { - struct cleanup *cleanups; - struct ui_file *file = gdb_fopen (args, "w"); + stdio_file file; - if (file == NULL) + if (!file.open (args, "w")) perror_with_name (_("maintenance print architecture")); - cleanups = make_cleanup_ui_file_delete (file); - gdbarch_dump (gdbarch, file); - do_cleanups (cleanups); + gdbarch_dump (gdbarch, &file); } } @@ -435,11 +411,12 @@ maintenance_print_architecture (char *args, int from_tty) "maintenance print" with no args. */ static void -maintenance_print_command (char *arg, int from_tty) +maintenance_print_command (const char *arg, int from_tty) { printf_unfiltered (_("\"maintenance print\" must be followed " "by the name of a print command.\n")); - help_list (maintenanceprintlist, "maintenance print ", -1, gdb_stdout); + help_list (maintenanceprintlist, "maintenance print ", all_commands, + gdb_stdout); } /* The "maintenance translate-address" command converts a section and address @@ -448,11 +425,11 @@ maintenance_print_command (char *arg, int from_tty) or maintenance translate-address . */ static void -maintenance_translate_address (char *arg, int from_tty) +maintenance_translate_address (const char *arg, int from_tty) { CORE_ADDR address; struct obj_section *sect; - char *p; + const char *p; struct bound_minimal_symbol sym; struct objfile *objfile; @@ -468,12 +445,13 @@ maintenance_translate_address (char *arg, int from_tty) p++; if (*p == '\000') /* End of command? */ error (_("Need to specify and
")); - *p++ = '\000'; - p = skip_spaces (p); + + int arg_len = p - arg; + p = skip_spaces (p + 1); ALL_OBJSECTIONS (objfile, sect) { - if (strcmp (sect->the_bfd_section->name, arg) == 0) + if (strncmp (sect->the_bfd_section->name, arg, arg_len) == 0) break; } @@ -490,11 +468,11 @@ maintenance_translate_address (char *arg, int from_tty) if (sym.minsym) { - const char *symbol_name = SYMBOL_PRINT_NAME (sym.minsym); + const char *symbol_name = MSYMBOL_PRINT_NAME (sym.minsym); const char *symbol_offset - = pulongest (address - SYMBOL_VALUE_ADDRESS (sym.minsym)); + = pulongest (address - BMSYMBOL_VALUE_ADDRESS (sym)); - sect = SYMBOL_OBJ_SECTION(sym.objfile, sym.minsym); + sect = MSYMBOL_OBJ_SECTION(sym.objfile, sym.minsym); if (sect != NULL) { const char *section_name; @@ -503,8 +481,8 @@ maintenance_translate_address (char *arg, int from_tty) gdb_assert (sect->the_bfd_section && sect->the_bfd_section->name); section_name = sect->the_bfd_section->name; - gdb_assert (sect->objfile && sect->objfile->name); - obj_name = sect->objfile->name; + gdb_assert (sect->objfile && objfile_name (sect->objfile)); + obj_name = objfile_name (sect->objfile); if (MULTI_OBJFILE_P ()) printf_filtered (_("%s + %s in section %s of %s\n"), @@ -532,7 +510,7 @@ maintenance_translate_address (char *arg, int from_tty) offered. */ static void -maintenance_deprecate (char *args, int from_tty) +maintenance_deprecate (const char *args, int from_tty) { if (args == NULL || *args == '\0') { @@ -542,12 +520,11 @@ enclosed in quotes.\n")); } maintenance_do_deprecate (args, 1); - } static void -maintenance_undeprecate (char *args, int from_tty) +maintenance_undeprecate (const char *args, int from_tty) { if (args == NULL || *args == '\0') { @@ -556,7 +533,6 @@ the command you want to undeprecate.\n")); } maintenance_do_deprecate (args, 0); - } /* You really shouldn't be using this. It is just for the testsuite. @@ -567,14 +543,14 @@ the command you want to undeprecate.\n")); replacement. */ static void -maintenance_do_deprecate (char *text, int deprecate) +maintenance_do_deprecate (const char *text, int deprecate) { struct cmd_list_element *alias = NULL; struct cmd_list_element *prefix_cmd = NULL; struct cmd_list_element *cmd = NULL; - char *start_ptr = NULL; - char *end_ptr = NULL; + const char *start_ptr = NULL; + const char *end_ptr = NULL; int len; char *replacement = NULL; @@ -598,8 +574,7 @@ maintenance_do_deprecate (char *text, int deprecate) if (end_ptr != NULL) { len = end_ptr - start_ptr; - start_ptr[len] = '\0'; - replacement = xstrdup (start_ptr); + replacement = savestring (start_ptr, len); } } } @@ -615,28 +590,40 @@ maintenance_do_deprecate (char *text, int deprecate) memory. */ if (alias) { - if (alias->flags & MALLOCED_REPLACEMENT) - xfree (alias->replacement); + if (alias->malloced_replacement) + xfree ((char *) alias->replacement); if (deprecate) - alias->flags |= (DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + alias->deprecated_warn_user = 1; + alias->cmd_deprecated = 1; + } else - alias->flags &= ~(DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + alias->deprecated_warn_user = 0; + alias->cmd_deprecated = 0; + } alias->replacement = replacement; - alias->flags |= MALLOCED_REPLACEMENT; + alias->malloced_replacement = 1; return; } else if (cmd) { - if (cmd->flags & MALLOCED_REPLACEMENT) - xfree (cmd->replacement); + if (cmd->malloced_replacement) + xfree ((char *) cmd->replacement); if (deprecate) - cmd->flags |= (DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + cmd->deprecated_warn_user = 1; + cmd->cmd_deprecated = 1; + } else - cmd->flags &= ~(DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + cmd->deprecated_warn_user = 0; + cmd->cmd_deprecated = 0; + } cmd->replacement = replacement; - cmd->flags |= MALLOCED_REPLACEMENT; + cmd->malloced_replacement = 1; return; } xfree (replacement); @@ -648,15 +635,16 @@ struct cmd_list_element *maintenance_set_cmdlist; struct cmd_list_element *maintenance_show_cmdlist; static void -maintenance_set_cmd (char *args, int from_tty) +maintenance_set_cmd (const char *args, int from_tty) { printf_unfiltered (_("\"maintenance set\" must be followed " "by the name of a set command.\n")); - help_list (maintenance_set_cmdlist, "maintenance set ", -1, gdb_stdout); + help_list (maintenance_set_cmdlist, "maintenance set ", all_commands, + gdb_stdout); } static void -maintenance_show_cmd (char *args, int from_tty) +maintenance_show_cmd (const char *args, int from_tty) { cmd_show_list (maintenance_show_cmdlist, from_tty, ""); } @@ -683,17 +671,20 @@ extern char etext; static int profiling_state; +EXTERN_C void _mcleanup (void); + static void mcleanup_wrapper (void) { - extern void _mcleanup (void); - if (profiling_state) _mcleanup (); } +EXTERN_C void monstartup (unsigned long, unsigned long); +extern int main (); + static void -maintenance_set_profile_cmd (char *args, int from_tty, +maintenance_set_profile_cmd (const char *args, int from_tty, struct cmd_list_element *c) { if (maintenance_profile_p == profiling_state) @@ -705,9 +696,6 @@ maintenance_set_profile_cmd (char *args, int from_tty, { static int profiling_initialized; - extern void monstartup (unsigned long, unsigned long); - extern int main(); - if (!profiling_initialized) { atexit (mcleanup_wrapper); @@ -727,7 +715,7 @@ maintenance_set_profile_cmd (char *args, int from_tty, } #else static void -maintenance_set_profile_cmd (char *args, int from_tty, +maintenance_set_profile_cmd (const char *args, int from_tty, struct cmd_list_element *c) { error (_("Profiling support is not available on this system.")); @@ -751,31 +739,6 @@ static int per_command_symtab; static struct cmd_list_element *per_command_setlist; static struct cmd_list_element *per_command_showlist; -/* Records a run time and space usage to be used as a base for - reporting elapsed time or change in space. */ - -struct cmd_stats -{ - /* Zero if the saved time is from the beginning of GDB execution. - One if from the beginning of an individual command execution. */ - int msg_type; - /* Track whether the stat was enabled at the start of the command - so that we can avoid printing anything if it gets turned on by - the current command. */ - int time_enabled : 1; - int space_enabled : 1; - int symtab_enabled : 1; - long start_cpu_time; - struct timeval start_wall_time; - long start_space; - /* Total number of symtabs (over all objfiles). */ - int start_nr_symtabs; - /* Of those, a count of just the primary ones. */ - int start_nr_primary_symtabs; - /* Total number of blocks. */ - int start_nr_blocks; -}; - /* Set whether to display time statistics to NEW_VALUE (non-zero means true). */ @@ -797,71 +760,81 @@ set_per_command_space (int new_value) /* Count the number of symtabs and blocks. */ static void -count_symtabs_and_blocks (int *nr_symtabs_ptr, int *nr_primary_symtabs_ptr, +count_symtabs_and_blocks (int *nr_symtabs_ptr, int *nr_compunit_symtabs_ptr, int *nr_blocks_ptr) { struct objfile *o; + struct compunit_symtab *cu; struct symtab *s; int nr_symtabs = 0; - int nr_primary_symtabs = 0; + int nr_compunit_symtabs = 0; int nr_blocks = 0; - ALL_SYMTABS (o, s) + /* When collecting statistics during startup, this is called before + pretty much anything in gdb has been initialized, and thus + current_program_space may be NULL. */ + if (current_program_space != NULL) { - ++nr_symtabs; - if (s->primary) + ALL_COMPUNITS (o, cu) { - ++nr_primary_symtabs; - nr_blocks += BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s)); + ++nr_compunit_symtabs; + nr_blocks += BLOCKVECTOR_NBLOCKS (COMPUNIT_BLOCKVECTOR (cu)); + ALL_COMPUNIT_FILETABS (cu, s) + ++nr_symtabs; } } *nr_symtabs_ptr = nr_symtabs; - *nr_primary_symtabs_ptr = nr_primary_symtabs; + *nr_compunit_symtabs_ptr = nr_compunit_symtabs; *nr_blocks_ptr = nr_blocks; } -/* As indicated by display_time and display_space, report GDB's elapsed time - and space usage from the base time and space provided in ARG, which - must be a pointer to a struct cmd_stat. This function is intended - to be called as a cleanup. */ +/* As indicated by display_time and display_space, report GDB's + elapsed time and space usage from the base time and space recorded + in this object. */ -static void -report_command_stats (void *arg) +scoped_command_stats::~scoped_command_stats () { - struct cmd_stats *start_stats = (struct cmd_stats *) arg; - int msg_type = start_stats->msg_type; + /* Early exit if we're not reporting any stats. It can be expensive to + compute the pre-command values so don't collect them at all if we're + not reporting stats. Alas this doesn't work in the startup case because + we don't know yet whether we will be reporting the stats. For the + startup case collect the data anyway (it should be cheap at this point), + and leave it to the reporter to decide whether to print them. */ + if (m_msg_type + && !per_command_time + && !per_command_space + && !per_command_symtab) + return; - if (start_stats->time_enabled) + if (m_time_enabled && per_command_time) { - long cmd_time = get_run_time () - start_stats->start_cpu_time; - struct timeval now_wall_time, delta_wall_time, wait_time; + using namespace std::chrono; - gettimeofday (&now_wall_time, NULL); - timeval_sub (&delta_wall_time, - &now_wall_time, &start_stats->start_wall_time); + run_time_clock::duration cmd_time + = run_time_clock::now () - m_start_cpu_time; + steady_clock::duration wall_time + = steady_clock::now () - m_start_wall_time; /* Subtract time spend in prompt_for_continue from walltime. */ - wait_time = get_prompt_for_continue_wait_time (); - timeval_sub (&delta_wall_time, &delta_wall_time, &wait_time); - - printf_unfiltered (msg_type == 0 - ? _("Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n") - : _("Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"), - cmd_time / 1000000, cmd_time % 1000000, - (long) delta_wall_time.tv_sec, - (long) delta_wall_time.tv_usec); + wall_time -= get_prompt_for_continue_wait_time (); + + printf_unfiltered (!m_msg_type + ? _("Startup time: %.6f (cpu), %.6f (wall)\n") + : _("Command execution time: %.6f (cpu), %.6f (wall)\n"), + duration (cmd_time).count (), + duration (wall_time).count ()); } - if (start_stats->space_enabled) + if (m_space_enabled && per_command_space) { #ifdef HAVE_SBRK char *lim = (char *) sbrk (0); long space_now = lim - lim_at_start; - long space_diff = space_now - start_stats->start_space; + long space_diff = space_now - m_start_space; - printf_unfiltered (msg_type == 0 + printf_unfiltered (!m_msg_type ? _("Space used: %ld (%s%ld during startup)\n") : _("Space used: %ld (%s%ld for this command)\n"), space_now, @@ -870,83 +843,73 @@ report_command_stats (void *arg) #endif } - if (start_stats->symtab_enabled) + if (m_symtab_enabled && per_command_symtab) { - int nr_symtabs, nr_primary_symtabs, nr_blocks; + int nr_symtabs, nr_compunit_symtabs, nr_blocks; - count_symtabs_and_blocks (&nr_symtabs, &nr_primary_symtabs, &nr_blocks); + count_symtabs_and_blocks (&nr_symtabs, &nr_compunit_symtabs, &nr_blocks); printf_unfiltered (_("#symtabs: %d (+%d)," - " #primary symtabs: %d (+%d)," + " #compunits: %d (+%d)," " #blocks: %d (+%d)\n"), nr_symtabs, - nr_symtabs - start_stats->start_nr_symtabs, - nr_primary_symtabs, - nr_primary_symtabs - start_stats->start_nr_primary_symtabs, + nr_symtabs - m_start_nr_symtabs, + nr_compunit_symtabs, + (nr_compunit_symtabs + - m_start_nr_compunit_symtabs), nr_blocks, - nr_blocks - start_stats->start_nr_blocks); + nr_blocks - m_start_nr_blocks); } } -/* Create a cleanup that reports time and space used since its creation. - MSG_TYPE is zero for gdb startup, otherwise it is one(1) to report - data for individual commands. */ - -struct cleanup * -make_command_stats_cleanup (int msg_type) +scoped_command_stats::scoped_command_stats (bool msg_type) +: m_msg_type (msg_type) { - struct cmd_stats *new_stat; - - /* Early exit if we're not reporting any stats. */ - if (!per_command_time - && !per_command_space - && !per_command_symtab) - return make_cleanup (null_cleanup, 0); - - new_stat = XZALLOC (struct cmd_stats); - - new_stat->msg_type = msg_type; - - if (per_command_space) + if (!m_msg_type || per_command_space) { #ifdef HAVE_SBRK char *lim = (char *) sbrk (0); - new_stat->start_space = lim - lim_at_start; - new_stat->space_enabled = 1; + m_start_space = lim - lim_at_start; + m_space_enabled = 1; #endif } + else + m_space_enabled = 0; - if (per_command_time) + if (msg_type == 0 || per_command_time) { - new_stat->start_cpu_time = get_run_time (); - gettimeofday (&new_stat->start_wall_time, NULL); - new_stat->time_enabled = 1; + using namespace std::chrono; + + m_start_cpu_time = run_time_clock::now (); + m_start_wall_time = steady_clock::now (); + m_time_enabled = 1; } + else + m_time_enabled = 0; - if (per_command_symtab) + if (msg_type == 0 || per_command_symtab) { - int nr_symtabs, nr_primary_symtabs, nr_blocks; + int nr_symtabs, nr_compunit_symtabs, nr_blocks; - count_symtabs_and_blocks (&nr_symtabs, &nr_primary_symtabs, &nr_blocks); - new_stat->start_nr_symtabs = nr_symtabs; - new_stat->start_nr_primary_symtabs = nr_primary_symtabs; - new_stat->start_nr_blocks = nr_blocks; - new_stat->symtab_enabled = 1; + count_symtabs_and_blocks (&nr_symtabs, &nr_compunit_symtabs, &nr_blocks); + m_start_nr_symtabs = nr_symtabs; + m_start_nr_compunit_symtabs = nr_compunit_symtabs; + m_start_nr_blocks = nr_blocks; + m_symtab_enabled = 1; } + else + m_symtab_enabled = 0; - /* Initalize timer to keep track of how long we waited for the user. */ + /* Initialize timer to keep track of how long we waited for the user. */ reset_prompt_for_continue_wait_time (); - - return make_cleanup_dtor (report_command_stats, new_stat, xfree); } /* Handle unknown "mt set per-command" arguments. In this case have "mt set per-command on|off" affect every setting. */ static void -set_per_command_cmd (char *args, int from_tty) +set_per_command_cmd (const char *args, int from_tty) { struct cmd_list_element *list; - size_t length; int val; val = parse_cli_boolean_value (args); @@ -965,19 +928,49 @@ set_per_command_cmd (char *args, int from_tty) "show per-command " settings. */ static void -show_per_command_cmd (char *args, int from_tty) +show_per_command_cmd (const char *args, int from_tty) { cmd_show_list (per_command_showlist, from_tty, ""); } + + +/* The "maintenance selftest" command. */ + +static void +maintenance_selftest (const char *args, int from_tty) +{ +#if GDB_SELF_TEST + selftests::run_tests (args); +#else + printf_filtered (_("\ +Selftests are not available in a non-development build.\n")); +#endif +} + +static void +maintenance_info_selftests (const char *arg, int from_tty) +{ +#if GDB_SELF_TEST + printf_filtered ("Registered selftests:\n"); + selftests::for_each_selftest ([] (const std::string &name) { + printf_filtered (" - %s\n", name.c_str ()); + }); +#else + printf_filtered (_("\ +Selftests are not available in a non-development build.\n")); +#endif +} + void _initialize_maint_cmds (void) { + struct cmd_list_element *cmd; + add_prefix_cmd ("maintenance", class_maintenance, maintenance_command, _("\ Commands for use by GDB maintainers.\n\ Includes commands to dump specific internal GDB structures in\n\ -a human readable form, to cause GDB to deliberately dump core,\n\ -to test internal functions such as the C++/ObjC demangler, etc."), +a human readable form, to cause GDB to deliberately dump core, etc."), &maintenancelist, "maintenance ", 0, &cmdlist); @@ -1040,20 +1033,25 @@ Give GDB an internal warning.\n\ Cause GDB to behave as if an internal warning was reported."), &maintenancelist); - add_cmd ("demangle", class_maintenance, maintenance_demangle, _("\ -Demangle a C++/ObjC mangled name.\n\ -Call internal GDB demangler routine to demangle a C++ link name\n\ -and prints the result."), + add_cmd ("demangler-warning", class_maintenance, + maintenance_demangler_warning, _("\ +Give GDB a demangler warning.\n\ +Cause GDB to behave as if a demangler warning was reported."), &maintenancelist); + cmd = add_cmd ("demangle", class_maintenance, maintenance_demangle, _("\ +This command has been moved to \"demangle\"."), + &maintenancelist); + deprecate_cmd (cmd, "demangle"); + add_prefix_cmd ("per-command", class_maintenance, set_per_command_cmd, _("\ Per-command statistics settings."), - &per_command_setlist, "set per-command ", + &per_command_setlist, "maintenance set per-command ", 1/*allow-unknown*/, &maintenance_set_cmdlist); add_prefix_cmd ("per-command", class_maintenance, show_per_command_cmd, _("\ Show per-command statistics settings."), - &per_command_showlist, "show per-command ", + &per_command_showlist, "maintenance show per-command ", 0/*allow-unknown*/, &maintenance_show_cmdlist); add_setshow_boolean_cmd ("time", class_maintenance, @@ -1118,6 +1116,11 @@ Print the internal architecture configuration.\n\ Takes an optional file parameter."), &maintenanceprintlist); + add_prefix_cmd ("check", class_maintenance, maintenance_check_command, _("\ +Commands for checking internal gdb state."), + &maintenancechecklist, "maintenance check ", 0, + &maintenancelist); + add_cmd ("translate-address", class_maintenance, maintenance_translate_address, _("Translate a section name and address to a symbol."), @@ -1136,6 +1139,16 @@ testsuite can check the command deprecator. You probably shouldn't use this,\n\ If you decide you want to use it: maintenance undeprecate 'commandname'"), &maintenancelist); + add_cmd ("selftest", class_maintenance, maintenance_selftest, _("\ +Run gdb's unit tests.\n\ +Usage: maintenance selftest [filter]\n\ +This will run any unit tests that were built in to gdb.\n\ +If a filter is given, only the tests with that value in their name will ran."), + &maintenancelist); + + add_cmd ("selftests", class_maintenance, maintenance_info_selftests, + _("List the registered selftests."), &maintenanceinfolist); + add_setshow_zinteger_cmd ("watchdog", class_maintenance, &watchdog, _("\ Set watchdog timer."), _("\ Show watchdog timer."), _("\