X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fmaint.c;h=837ed23cfb6b9217aacab4103b687eb7ba51ec15;hb=2ddaf614439b50e6019c5218f2fbfc0d14194e96;hp=b540d1c6bba64594d2ade081cd0fde2b53f9e392;hpb=1526853e34c063bef25bd7d0eb15c1449c28e999;p=external%2Fbinutils.git diff --git a/gdb/maint.c b/gdb/maint.c index b540d1c..837ed23 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -1,6 +1,6 @@ /* Support for GDB maintenance commands. - Copyright (C) 1992-2017 Free Software Foundation, Inc. + Copyright (C) 1992-2019 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support. @@ -38,48 +38,19 @@ #include "value.h" #include "top.h" #include "maint.h" -#include "selftest.h" +#include "gdbsupport/selftest.h" #include "cli/cli-decode.h" #include "cli/cli-utils.h" #include "cli/cli-setshow.h" +#include "cli/cli-cmds.h" -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); - -/* 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 - the command is aborted. This replaces most of the need for timeouts in the - GDB test suite, and makes it possible to distinguish between a hung target - and one with slow communications. */ - -int watchdog = 0; -static void -show_watchdog (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) -{ - fprintf_filtered (file, _("Watchdog timer is %s.\n"), value); -} +static void maintenance_do_deprecate (const char *, int); /* 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")); @@ -88,7 +59,7 @@ maintenance_command (char *args, int from_tty) #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? "))) { @@ -110,7 +81,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)); } @@ -121,7 +92,7 @@ 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)); } @@ -130,7 +101,7 @@ maintenance_internal_warning (char *args, int from_tty) demangler problem is detected. Allows testing of the mechanism. */ static void -maintenance_demangler_warning (char *args, int from_tty) +maintenance_demangler_warning (const char *args, int from_tty) { demangler_warning (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); } @@ -140,13 +111,13 @@ maintenance_demangler_warning (char *args, int from_tty) "mt demangler-warning" which artificially creates an internal gdb error. */ static void -maintenance_demangle (char *args, int from_tty) +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")); @@ -155,7 +126,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"); @@ -168,7 +139,7 @@ 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")); @@ -181,7 +152,7 @@ maintenance_info_command (char *arg, int from_tty) "maintenance check" with no args. */ static void -maintenance_check_command (char *arg, int from_tty) +maintenance_check_command (const char *arg, int from_tty) { printf_unfiltered (_("\"maintenance check\" must be followed " "by the name of a check command.\n")); @@ -354,38 +325,40 @@ 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) { + struct obj_section *osect; + bool allobj = false; + printf_filtered (_("Exec file:\n")); printf_filtered (" `%s', ", bfd_get_filename (exec_bfd)); wrap_here (" "); printf_filtered (_("file type %s.\n"), bfd_get_target (exec_bfd)); - if (arg && *arg && match_substring (arg, "ALLOBJ")) - { - struct objfile *ofile; - struct obj_section *osect; - /* Only this function cares about the 'ALLOBJ' argument; - if 'ALLOBJ' is the only argument, discard it rather than - passing it down to print_objfile_section_info (which - wouldn't know how to handle it). */ - if (strcmp (arg, "ALLOBJ") == 0) - arg = NULL; + /* Only this function cares about the 'ALLOBJ' argument; + if 'ALLOBJ' is the only argument, discard it rather than + passing it down to print_objfile_section_info (which + wouldn't know how to handle it). */ + if (arg && strcmp (arg, "ALLOBJ") == 0) + { + arg = NULL; + allobj = true; + } - ALL_OBJFILES (ofile) + for (objfile *ofile : current_program_space->objfiles ()) + { + if (allobj) + printf_filtered (_(" Object file: %s\n"), + bfd_get_filename (ofile->obfd)); + ALL_OBJFILE_OSECTIONS (ofile, osect) { - printf_filtered (_(" Object file: %s\n"), - bfd_get_filename (ofile->obfd)); - ALL_OBJFILE_OSECTIONS (ofile, osect) - { - print_objfile_section_info (ofile->obfd, osect, arg); - } + if (!allobj && ofile->obfd != exec_bfd) + continue; + print_objfile_section_info (ofile->obfd, osect, arg); } } - else - bfd_map_over_sections (exec_bfd, print_bfd_section_info, arg); } if (core_bfd) @@ -394,19 +367,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 (); @@ -427,7 +400,7 @@ 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")); @@ -441,13 +414,12 @@ 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; if (arg == NULL || *arg == 0) error (_("requires argument (address or section + address)")); @@ -460,18 +432,20 @@ maintenance_translate_address (char *arg, int from_tty) while (*p && !isspace (*p)) /* Find end of section name. */ p++; if (*p == '\000') /* End of command? */ - error (_("Need to specify and
")); - *p++ = '\000'; - p = skip_spaces (p); + error (_("Need to specify section name and address")); - ALL_OBJSECTIONS (objfile, sect) - { - if (strcmp (sect->the_bfd_section->name, arg) == 0) - break; - } + int arg_len = p - arg; + p = skip_spaces (p + 1); + + for (objfile *objfile : current_program_space->objfiles ()) + ALL_OBJFILE_OSECTIONS (objfile, sect) + { + if (strncmp (sect->the_bfd_section->name, arg, arg_len) == 0) + goto found; + } - if (!objfile) - error (_("Unknown section %s."), arg); + error (_("Unknown section %s."), arg); + found: ; } address = parse_and_eval_address (p); @@ -525,7 +499,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') { @@ -535,12 +509,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') { @@ -549,7 +522,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. @@ -560,14 +532,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; @@ -591,8 +563,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); } } } @@ -653,7 +624,7 @@ 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")); @@ -662,11 +633,29 @@ maintenance_set_cmd (char *args, int from_tty) } 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, ""); } +/* "maintenance with" command. */ + +static void +maintenance_with_cmd (const char *args, int from_tty) +{ + with_command_1 ("maintenance set ", maintenance_set_cmdlist, args, from_tty); +} + +/* "maintenance with" command completer. */ + +static void +maintenance_with_cmd_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char * /*word*/) +{ + with_command_completer_1 ("maintenance set ", tracker, text); +} + /* Profiling support. */ static int maintenance_profile_p; @@ -702,7 +691,7 @@ 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) @@ -733,7 +722,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.")); @@ -781,9 +770,6 @@ static void 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_compunit_symtabs = 0; int nr_blocks = 0; @@ -793,12 +779,15 @@ count_symtabs_and_blocks (int *nr_symtabs_ptr, int *nr_compunit_symtabs_ptr, current_program_space may be NULL. */ if (current_program_space != NULL) { - ALL_COMPUNITS (o, cu) + for (objfile *o : current_program_space->objfiles ()) { - ++nr_compunit_symtabs; - nr_blocks += BLOCKVECTOR_NBLOCKS (COMPUNIT_BLOCKVECTOR (cu)); - ALL_COMPUNIT_FILETABS (cu, s) - ++nr_symtabs; + for (compunit_symtab *cu : o->compunits ()) + { + ++nr_compunit_symtabs; + nr_blocks += BLOCKVECTOR_NBLOCKS (COMPUNIT_BLOCKVECTOR (cu)); + nr_symtabs += std::distance (compunit_filetabs (cu).begin (), + compunit_filetabs (cu).end ()); + } } } @@ -827,6 +816,8 @@ scoped_command_stats::~scoped_command_stats () if (m_time_enabled && per_command_time) { + print_time (_("command finished")); + using namespace std::chrono; run_time_clock::duration cmd_time @@ -846,7 +837,7 @@ scoped_command_stats::~scoped_command_stats () if (m_space_enabled && per_command_space) { -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK char *lim = (char *) sbrk (0); long space_now = lim - lim_at_start; @@ -884,7 +875,7 @@ scoped_command_stats::scoped_command_stats (bool msg_type) { if (!m_msg_type || per_command_space) { -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK char *lim = (char *) sbrk (0); m_start_space = lim - lim_at_start; m_space_enabled = 1; @@ -900,6 +891,9 @@ scoped_command_stats::scoped_command_stats (bool msg_type) m_start_cpu_time = run_time_clock::now (); m_start_wall_time = steady_clock::now (); m_time_enabled = 1; + + if (per_command_time) + print_time (_("command started")); } else m_time_enabled = 0; @@ -921,11 +915,31 @@ scoped_command_stats::scoped_command_stats (bool msg_type) reset_prompt_for_continue_wait_time (); } +/* See maint.h. */ + +void +scoped_command_stats::print_time (const char *msg) +{ + using namespace std::chrono; + + auto now = system_clock::now (); + auto ticks = now.time_since_epoch ().count () / (1000 * 1000); + auto millis = ticks % 1000; + + std::time_t as_time = system_clock::to_time_t (now); + struct tm *tm = localtime (&as_time); + + char out[100]; + strftime (out, sizeof (out), "%F %H:%M:%S", tm); + + printf_unfiltered ("%s.%03d - %s\n", out, (int) millis, msg); +} + /* 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; int val; @@ -946,7 +960,7 @@ 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, ""); } @@ -955,18 +969,28 @@ show_per_command_cmd (char *args, int from_tty) /* The "maintenance selftest" command. */ static void -maintenance_selftest (char *args, int from_tty) +maintenance_selftest (const char *args, int from_tty) { +#if GDB_SELF_TEST selftests::run_tests (args); +#else + printf_filtered (_("\ +Selftests have been disabled for this build.\n")); +#endif } static void -maintenance_info_selftests (char *arg, int from_tty) +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 have been disabled for this build.\n")); +#endif } @@ -991,7 +1015,7 @@ Commands for showing internal info about the program being debugged."), add_alias_cmd ("i", "info", class_maintenance, 1, &maintenancelist); add_cmd ("sections", class_maintenance, maintenance_info_sections, _("\ -List the BFD sections of the exec and core files. \n\ +List the BFD sections of the exec and core files.\n\ Arguments may be any combination of:\n\ [one or more section names]\n\ ALLOC LOAD RELOC READONLY CODE DATA ROM CONSTRUCTOR\n\ @@ -1021,6 +1045,15 @@ Configure variables internal to GDB that aid in GDB's maintenance"), 0/*allow-unknown*/, &maintenancelist); + cmd = add_cmd ("with", class_maintenance, maintenance_with_cmd, _("\ +Like \"with\", but works with \"maintenance set\" variables.\n\ +Usage: maintenance with SETTING [VALUE] [-- COMMAND]\n\ +With no COMMAND, repeats the last executed command.\n\ +SETTING is any setting you can change with the \"maintenance set\"\n\ +subcommands."), + &maintenancelist); + set_cmd_completer_handle_brkchars (cmd, maintenance_with_cmd_completer); + #ifndef _WIN32 add_cmd ("dump-me", class_maintenance, maintenance_dump_me, _("\ Get fatal error; make debugger dump its core.\n\ @@ -1054,12 +1087,12 @@ This command has been moved to \"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, @@ -1135,21 +1168,22 @@ Commands for checking internal gdb state."), &maintenancelist); add_cmd ("deprecate", class_maintenance, maintenance_deprecate, _("\ -Deprecate a command. Note that this is just in here so the \n\ -testsuite can check the command deprecator. You probably shouldn't use this,\n\ -rather you should use the C function deprecate_cmd(). If you decide you \n\ -want to use it: maintenance deprecate 'commandname' \"replacement\". The \n\ -replacement is optional."), &maintenancelist); +Deprecate a command (for testing purposes).\n\ +Usage: maintenance deprecate COMMANDNAME [\"REPLACEMENT\"]\n\ +This is used by the testsuite to check the command deprecator.\n\ +You probably shouldn't use this,\n\ +rather you should use the C function deprecate_cmd()."), &maintenancelist); add_cmd ("undeprecate", class_maintenance, maintenance_undeprecate, _("\ -Undeprecate a command. Note that this is just in here so the \n\ -testsuite can check the command deprecator. You probably shouldn't use this,\n\ -If you decide you want to use it: maintenance undeprecate 'commandname'"), +Undeprecate a command (for testing purposes).\n\ +Usage: maintenance undeprecate COMMANDNAME\n\ +This is used by the testsuite to check the command deprecator.\n\ +You probably shouldn't use this."), &maintenancelist); add_cmd ("selftest", class_maintenance, maintenance_selftest, _("\ Run gdb's unit tests.\n\ -Usage: maintenance selftest [filter]\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); @@ -1157,16 +1191,6 @@ If a filter is given, only the tests with that value in their name will ran."), 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."), _("\ -When non-zero, this timeout is used instead of waiting forever for a target\n\ -to finish a low-level step or continue operation. If the specified amount\n\ -of time passes without a response from the target, an error occurs."), - NULL, - show_watchdog, - &setlist, &showlist); - add_setshow_boolean_cmd ("profile", class_maintenance, &maintenance_profile_p, _("\ Set internal profiling."), _("\