X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Futils.c;h=284fbbb834783191df980711c5f5ab81b2b91a24;hb=0ae1c716a162ce43a63c16c37aa8c6caaa484650;hp=8bae4ebaa0950a462d64ee003826ce3754e71b92;hpb=5b12a61c763421f05d233ebcce94d96536b5c5d4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/utils.c b/gdb/utils.c index 8bae4ebaa0..284fbbb834 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1,6 +1,6 @@ /* General utility routines for GDB, the GNU debugger. - Copyright (C) 1986-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -19,12 +19,9 @@ #include "defs.h" #include "dyn-string.h" -#include "gdb_assert.h" #include -#include "gdb_string.h" #include "gdb_wait.h" #include "event-top.h" -#include "exceptions.h" #include "gdbthread.h" #include "fnmatch.h" #include "gdb_bfd.h" @@ -40,11 +37,6 @@ #include #endif -/* SunOS's curses.h has a '#define reg register' in it. Thank you Sun. */ -#ifdef reg -#undef reg -#endif - #include #include "timeval-utils.h" #include "gdbcmd.h" @@ -66,13 +58,11 @@ #include "inferior.h" /* for signed_pointer_to_address */ -#include /* For MAXPATHLEN */ - #include "gdb_curses.h" #include "readline/readline.h" -#include +#include "gdb_sys_time.h" #include #include "gdb_usleep.h" @@ -89,9 +79,6 @@ extern PTR realloc (); /* ARI: PTR */ extern void free (); #endif -/* readline defines this. */ -#undef savestring - void (*deprecated_error_begin_hook) (void); /* Prototypes for local functions */ @@ -122,12 +109,6 @@ static int debug_timestamp = 0; int job_control; -#ifndef HAVE_PYTHON -/* Nonzero means a quit has been requested. */ - -int quit_flag; -#endif /* HAVE_PYTHON */ - /* Nonzero means quit immediately if Control-C is typed now, rather than waiting until QUIT is executed. Be careful in setting this; code which executes with immediate_quit set has to be very careful @@ -141,41 +122,6 @@ int quit_flag; int immediate_quit; -#ifndef HAVE_PYTHON - -/* Clear the quit flag. */ - -void -clear_quit_flag (void) -{ - quit_flag = 0; -} - -/* Set the quit flag. */ - -void -set_quit_flag (void) -{ - quit_flag = 1; -} - -/* Return true if the quit flag has been set, false otherwise. */ - -int -check_quit_flag (void) -{ - /* This is written in a particular way to avoid races. */ - if (quit_flag) - { - quit_flag = 0; - return 1; - } - - return 0; -} - -#endif /* HAVE_PYTHON */ - /* Nonzero means that strings with character values >0x7F should be printed as octal escapes. Zero means just print the value (e.g. it's an international character, and the terminal or window can cope.) */ @@ -190,14 +136,6 @@ show_sevenbit_strings (struct ui_file *file, int from_tty, value); } -/* String to be printed before error messages, if any. */ - -char *error_pre_print; - -/* String to be printed before quit messages, if any. */ - -char *quit_pre_print; - /* String to be printed before warning messages, if any. */ char *warning_pre_print = "\nwarning: "; @@ -244,7 +182,7 @@ make_cleanup_dyn_string_delete (dyn_string_t arg) static void do_bfd_close_cleanup (void *arg) { - gdb_bfd_unref (arg); + gdb_bfd_unref ((bfd *) arg); } struct cleanup * @@ -253,29 +191,12 @@ make_cleanup_bfd_unref (bfd *abfd) return make_cleanup (do_bfd_close_cleanup, abfd); } -static void -do_close_cleanup (void *arg) -{ - int *fd = arg; - - close (*fd); -} - -struct cleanup * -make_cleanup_close (int fd) -{ - int *saved_fd = xmalloc (sizeof (fd)); - - *saved_fd = fd; - return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree); -} - /* Helper function which does the work for make_cleanup_fclose. */ static void do_fclose_cleanup (void *arg) { - FILE *file = arg; + FILE *file = (FILE *) arg; fclose (file); } @@ -293,7 +214,7 @@ make_cleanup_fclose (FILE *file) static void do_obstack_free (void *arg) { - struct obstack *ob = arg; + struct obstack *ob = (struct obstack *) arg; obstack_free (ob, NULL); } @@ -309,7 +230,7 @@ make_cleanup_obstack_free (struct obstack *obstack) static void do_ui_file_delete (void *arg) { - ui_file_delete (arg); + ui_file_delete ((struct ui_file *) arg); } struct cleanup * @@ -323,7 +244,7 @@ make_cleanup_ui_file_delete (struct ui_file *arg) static void do_ui_out_redirect_pop (void *arg) { - struct ui_out *uiout = arg; + struct ui_out *uiout = (struct ui_out *) arg; if (ui_out_redirect (uiout, NULL) < 0) warning (_("Cannot restore redirection of the current output protocol")); @@ -341,7 +262,7 @@ make_cleanup_ui_out_redirect_pop (struct ui_out *uiout) static void do_free_section_addr_info (void *arg) { - free_section_addr_info (arg); + free_section_addr_info ((struct section_addr_info *) arg); } struct cleanup * @@ -359,7 +280,8 @@ struct restore_integer_closure static void restore_integer (void *p) { - struct restore_integer_closure *closure = p; + struct restore_integer_closure *closure + = (struct restore_integer_closure *) p; *(closure->variable) = closure->value; } @@ -370,8 +292,7 @@ restore_integer (void *p) struct cleanup * make_cleanup_restore_integer (int *variable) { - struct restore_integer_closure *c = - xmalloc (sizeof (struct restore_integer_closure)); + struct restore_integer_closure *c = XNEW (struct restore_integer_closure); c->variable = variable; c->value = *variable; @@ -393,7 +314,7 @@ make_cleanup_restore_uinteger (unsigned int *variable) static void do_unpush_target (void *arg) { - struct target_ops *ops = arg; + struct target_ops *ops = (struct target_ops *) arg; unpush_target (ops); } @@ -411,7 +332,7 @@ make_cleanup_unpush_target (struct target_ops *ops) static void do_htab_delete_cleanup (void *htab_voidp) { - htab_t htab = htab_voidp; + htab_t htab = (htab_t) htab_voidp; htab_delete (htab); } @@ -433,7 +354,8 @@ struct restore_ui_file_closure static void do_restore_ui_file (void *p) { - struct restore_ui_file_closure *closure = p; + struct restore_ui_file_closure *closure + = (struct restore_ui_file_closure *) p; *(closure->variable) = closure->value; } @@ -474,7 +396,7 @@ make_cleanup_value_free_to_mark (struct value *mark) static void do_value_free (void *value) { - value_free (value); + value_free ((struct value *) value); } /* Free VALUE. */ @@ -490,7 +412,7 @@ make_cleanup_value_free (struct value *value) static void do_free_so (void *arg) { - struct so_list *so = arg; + struct so_list *so = (struct so_list *) arg; free_so (so); } @@ -508,7 +430,7 @@ make_cleanup_free_so (struct so_list *so) static void do_restore_current_language (void *p) { - enum language saved_lang = (uintptr_t) p; + enum language saved_lang = (enum language) (uintptr_t) p; set_language (saved_lang); } @@ -525,6 +447,24 @@ make_cleanup_restore_current_language (void) (void *) (uintptr_t) saved_lang); } +/* Helper function for make_cleanup_clear_parser_state. */ + +static void +do_clear_parser_state (void *ptr) +{ + struct parser_state **p = (struct parser_state **) ptr; + + *p = NULL; +} + +/* Clean (i.e., set to NULL) the parser state variable P. */ + +struct cleanup * +make_cleanup_clear_parser_state (struct parser_state **p) +{ + return make_cleanup (do_clear_parser_state, (void *) p); +} + /* This function is useful for cleanups. Do @@ -536,7 +476,7 @@ make_cleanup_restore_current_language (void) void free_current_contents (void *ptr) { - void **location = ptr; + void **location = (void **) ptr; if (location == NULL) internal_error (__FILE__, __LINE__, @@ -547,117 +487,6 @@ free_current_contents (void *ptr) *location = NULL; } } - -/* If nonzero, display time usage both at startup and for each command. */ - -static int display_time; - -/* If nonzero, display space usage both at startup and for each command. */ - -static int display_space; - -/* Records a run time and space usage to be used as a base for - reporting elapsed time or change in space. In addition, - the msg_type field indicates whether the saved time is from the - beginning of GDB execution (0) or the beginning of an individual - command execution (1). */ -struct cmd_stats -{ - int msg_type; - long start_cpu_time; - struct timeval start_wall_time; - long start_space; -}; - -/* Set whether to display time statistics to NEW_VALUE (non-zero - means true). */ -void -set_display_time (int new_value) -{ - display_time = new_value; -} - -/* Set whether to display space statistics to NEW_VALUE (non-zero - means true). */ -void -set_display_space (int new_value) -{ - display_space = new_value; -} - -/* 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. */ -static void -report_command_stats (void *arg) -{ - struct cmd_stats *start_stats = (struct cmd_stats *) arg; - int msg_type = start_stats->msg_type; - - if (display_time) - { - long cmd_time = get_run_time () - start_stats->start_cpu_time; - struct timeval now_wall_time, delta_wall_time; - - gettimeofday (&now_wall_time, NULL); - timeval_sub (&delta_wall_time, - &now_wall_time, &start_stats->start_wall_time); - - /* Subtract time spend in prompt_for_continue from walltime. */ - timeval_sub (&delta_wall_time, - &delta_wall_time, &prompt_for_continue_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); - } - - if (display_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; - - printf_unfiltered (msg_type == 0 - ? _("Space used: %ld (%s%ld during startup)\n") - : _("Space used: %ld (%s%ld for this command)\n"), - space_now, - (space_diff >= 0 ? "+" : ""), - space_diff); -#endif - } -} - -/* Create a cleanup that reports time and space used since its - creation. Precise messages depend on MSG_TYPE: - 0: Initial time/space - 1: Individual command time/space. */ -struct cleanup * -make_command_stats_cleanup (int msg_type) -{ - static const struct timeval zero_timeval = { 0 }; - struct cmd_stats *new_stat = XMALLOC (struct cmd_stats); - -#ifdef HAVE_SBRK - char *lim = (char *) sbrk (0); - new_stat->start_space = lim - lim_at_start; -#endif - - new_stat->msg_type = msg_type; - new_stat->start_cpu_time = get_run_time (); - gettimeofday (&new_stat->start_wall_time, NULL); - - /* Initalize timer to keep track of how long we waited for the user. */ - prompt_for_continue_wait_time = zero_timeval; - - return make_cleanup_dtor (report_command_stats, new_stat, xfree); -} @@ -674,33 +503,18 @@ vwarning (const char *string, va_list args) (*deprecated_warning_hook) (string, args); else { - target_terminal_ours (); - wrap_here (""); /* Force out any buffered output. */ + if (target_supports_terminal_ours ()) + target_terminal_ours (); + if (filtered_printing_initialized ()) + wrap_here (""); /* Force out any buffered output. */ gdb_flush (gdb_stdout); if (warning_pre_print) fputs_unfiltered (warning_pre_print, gdb_stderr); vfprintf_unfiltered (gdb_stderr, string, args); fprintf_unfiltered (gdb_stderr, "\n"); - va_end (args); } } -/* Print a warning message. - The first argument STRING is the warning message, used as a fprintf string, - and the remaining args are passed as arguments to it. - The primary difference between warnings and errors is that a warning - does not force the return to command level. */ - -void -warning (const char *string, ...) -{ - va_list args; - - va_start (args, string); - vwarning (string, args); - va_end (args); -} - /* Print an error message and return to command level. The first argument STRING is the error message, used as a fprintf string, and the remaining args are passed as arguments to it. */ @@ -712,47 +526,30 @@ verror (const char *string, va_list args) } void -error (const char *string, ...) +error_stream (struct ui_file *stream) { - va_list args; - - va_start (args, string); - throw_verror (GENERIC_ERROR, string, args); - va_end (args); -} - -/* Print an error message and quit. - The first argument STRING is the error message, used as a fprintf string, - and the remaining args are passed as arguments to it. */ + char *message = ui_file_xstrdup (stream, NULL); -void -vfatal (const char *string, va_list args) -{ - throw_vfatal (string, args); + make_cleanup (xfree, message); + error (("%s"), message); } -void -fatal (const char *string, ...) -{ - va_list args; - - va_start (args, string); - throw_vfatal (string, args); - va_end (args); -} +/* Emit a message and abort. */ -void -error_stream (struct ui_file *stream) +static void ATTRIBUTE_NORETURN +abort_with_message (const char *msg) { - char *message = ui_file_xstrdup (stream, NULL); + if (gdb_stderr == NULL) + fputs (msg, stderr); + else + fputs_unfiltered (msg, gdb_stderr); - make_cleanup (xfree, message); - error (("%s"), message); + abort (); /* NOTE: GDB has only three calls to abort(). */ } /* Dump core trying to increase the core soft limit to hard limit first. */ -static void +void dump_core (void) { #ifdef HAVE_SETRLIMIT @@ -765,10 +562,12 @@ dump_core (void) } /* Check whether GDB will be able to dump core using the dump_core - function. */ + function. Returns zero if GDB cannot or should not dump core. + If LIMIT_KIND is LIMIT_CUR the user's soft limit will be respected. + If LIMIT_KIND is LIMIT_MAX only the hard limit will be respected. */ -static int -can_dump_core (const char *reason) +int +can_dump_core (enum resource_limit_kind limit_kind) { #ifdef HAVE_GETRLIMIT struct rlimit rlim; @@ -777,19 +576,47 @@ can_dump_core (const char *reason) if (getrlimit (RLIMIT_CORE, &rlim) != 0) return 1; - if (rlim.rlim_max == 0) + switch (limit_kind) { - fprintf_unfiltered (gdb_stderr, - _("%s\nUnable to dump core, use `ulimit -c" - " unlimited' before executing GDB next time.\n"), - reason); - return 0; + case LIMIT_CUR: + if (rlim.rlim_cur == 0) + return 0; + + case LIMIT_MAX: + if (rlim.rlim_max == 0) + return 0; } #endif /* HAVE_GETRLIMIT */ return 1; } +/* Print a warning that we cannot dump core. */ + +void +warn_cant_dump_core (const char *reason) +{ + fprintf_unfiltered (gdb_stderr, + _("%s\nUnable to dump core, use `ulimit -c" + " unlimited' before executing GDB next time.\n"), + reason); +} + +/* Check whether GDB will be able to dump core using the dump_core + function, and print a warning if we cannot. */ + +static int +can_dump_core_warn (enum resource_limit_kind limit_kind, + const char *reason) +{ + int core_dump_allowed = can_dump_core (limit_kind); + + if (!core_dump_allowed) + warn_cant_dump_core (reason); + + return core_dump_allowed; +} + /* Allow the user to configure the debugger behavior with respect to what to do when an internal problem is detected. */ @@ -811,7 +638,9 @@ static const char *const internal_problem_modes[] = struct internal_problem { const char *name; + int user_settable_should_quit; const char *should_quit; + int user_settable_should_dump_core; const char *should_dump_core; }; @@ -827,6 +656,7 @@ internal_vproblem (struct internal_problem *problem, int quit_p; int dump_core_p; char *reason; + struct cleanup *cleanup = make_cleanup (null_cleanup, NULL); /* Don't allow infinite error/warning recursion. */ { @@ -839,8 +669,7 @@ internal_vproblem (struct internal_problem *problem, break; case 1: dejavu = 2; - fputs_unfiltered (msg, gdb_stderr); - abort (); /* NOTE: GDB has only three calls to abort(). */ + abort_with_message (msg); default: dejavu = 3; /* Newer GLIBC versions put the warn_unused_result attribute @@ -854,10 +683,6 @@ internal_vproblem (struct internal_problem *problem, } } - /* Try to get the message out and at the start of a new line. */ - target_terminal_ours (); - begin_line (); - /* Create a string containing the full error/warning message. Need to call query with this full string, as otherwize the reason (error/warning) and question become separated. Format using a @@ -875,18 +700,32 @@ internal_vproblem (struct internal_problem *problem, make_cleanup (xfree, reason); } + /* Fall back to abort_with_message if gdb_stderr is not set up. */ + if (gdb_stderr == NULL) + { + fputs (reason, stderr); + abort_with_message ("\n"); + } + + /* Try to get the message out and at the start of a new line. */ + if (target_supports_terminal_ours ()) + target_terminal_ours (); + if (filtered_printing_initialized ()) + begin_line (); + + /* Emit the message unless query will emit it below. */ + if (problem->should_quit != internal_problem_ask + || !confirm + || !filtered_printing_initialized ()) + fprintf_unfiltered (gdb_stderr, "%s\n", reason); + if (problem->should_quit == internal_problem_ask) { /* Default (yes/batch case) is to quit GDB. When in batch mode this lessens the likelihood of GDB going into an infinite loop. */ - if (!confirm) - { - /* Emit the message and quit. */ - fputs_unfiltered (reason, gdb_stderr); - fputs_unfiltered ("\n", gdb_stderr); - quit_p = 1; - } + if (!confirm || !filtered_printing_initialized ()) + quit_p = 1; else quit_p = query (_("%s\nQuit this debugging session? "), reason); } @@ -897,10 +736,18 @@ internal_vproblem (struct internal_problem *problem, else internal_error (__FILE__, __LINE__, _("bad switch")); + fputs_unfiltered (_("\nThis is a bug, please report it."), gdb_stderr); + if (REPORT_BUGS_TO[0]) + fprintf_unfiltered (gdb_stderr, _(" For instructions, see:\n%s."), + REPORT_BUGS_TO); + fputs_unfiltered ("\n\n", gdb_stderr); + if (problem->should_dump_core == internal_problem_ask) { - if (!can_dump_core (reason)) + if (!can_dump_core_warn (LIMIT_MAX, reason)) dump_core_p = 0; + else if (!filtered_printing_initialized ()) + dump_core_p = 1; else { /* Default (yes/batch case) is to dump core. This leaves a GDB @@ -910,7 +757,7 @@ internal_vproblem (struct internal_problem *problem, } } else if (problem->should_dump_core == internal_problem_yes) - dump_core_p = can_dump_core (reason); + dump_core_p = can_dump_core_warn (LIMIT_MAX, reason); else if (problem->should_dump_core == internal_problem_no) dump_core_p = 0; else @@ -935,46 +782,47 @@ internal_vproblem (struct internal_problem *problem, } dejavu = 0; + do_cleanups (cleanup); } static struct internal_problem internal_error_problem = { - "internal-error", internal_problem_ask, internal_problem_ask + "internal-error", 1, internal_problem_ask, 1, internal_problem_ask }; void internal_verror (const char *file, int line, const char *fmt, va_list ap) { internal_vproblem (&internal_error_problem, file, line, fmt, ap); - deprecated_throw_reason (RETURN_ERROR); + throw_quit (_("Command aborted.")); } +static struct internal_problem internal_warning_problem = { + "internal-warning", 1, internal_problem_ask, 1, internal_problem_ask +}; + void -internal_error (const char *file, int line, const char *string, ...) +internal_vwarning (const char *file, int line, const char *fmt, va_list ap) { - va_list ap; - - va_start (ap, string); - internal_verror (file, line, string, ap); - va_end (ap); + internal_vproblem (&internal_warning_problem, file, line, fmt, ap); } -static struct internal_problem internal_warning_problem = { - "internal-warning", internal_problem_ask, internal_problem_ask +static struct internal_problem demangler_warning_problem = { + "demangler-warning", 1, internal_problem_ask, 0, internal_problem_no }; void -internal_vwarning (const char *file, int line, const char *fmt, va_list ap) +demangler_vwarning (const char *file, int line, const char *fmt, va_list ap) { - internal_vproblem (&internal_warning_problem, file, line, fmt, ap); + internal_vproblem (&demangler_warning_problem, file, line, fmt, ap); } void -internal_warning (const char *file, int line, const char *string, ...) +demangler_warning (const char *file, int line, const char *string, ...) { va_list ap; va_start (ap, string); - internal_vwarning (file, line, string, ap); + demangler_vwarning (file, line, string, ap); va_end (ap); } @@ -1013,8 +861,8 @@ add_internal_problem_command (struct internal_problem *problem) char *set_doc; char *show_doc; - set_cmd_list = xmalloc (sizeof (*set_cmd_list)); - show_cmd_list = xmalloc (sizeof (*set_cmd_list)); + set_cmd_list = XNEW (struct cmd_list_element *); + show_cmd_list = XNEW (struct cmd_list_element *); *set_cmd_list = NULL; *show_cmd_list = NULL; @@ -1038,62 +886,84 @@ add_internal_problem_command (struct internal_problem *problem) (char *) NULL), 0/*allow-unknown*/, &maintenance_show_cmdlist); - set_doc = xstrprintf (_("Set whether GDB should quit " - "when an %s is detected"), - problem->name); - show_doc = xstrprintf (_("Show whether GDB will quit " - "when an %s is detected"), - problem->name); - add_setshow_enum_cmd ("quit", class_maintenance, - internal_problem_modes, - &problem->should_quit, - set_doc, - show_doc, - NULL, /* help_doc */ - NULL, /* setfunc */ - NULL, /* showfunc */ - set_cmd_list, - show_cmd_list); - - xfree (set_doc); - xfree (show_doc); - - set_doc = xstrprintf (_("Set whether GDB should create a core " - "file of GDB when %s is detected"), - problem->name); - show_doc = xstrprintf (_("Show whether GDB will create a core " - "file of GDB when %s is detected"), - problem->name); - add_setshow_enum_cmd ("corefile", class_maintenance, - internal_problem_modes, - &problem->should_dump_core, - set_doc, - show_doc, - NULL, /* help_doc */ - NULL, /* setfunc */ - NULL, /* showfunc */ - set_cmd_list, - show_cmd_list); + if (problem->user_settable_should_quit) + { + set_doc = xstrprintf (_("Set whether GDB should quit " + "when an %s is detected"), + problem->name); + show_doc = xstrprintf (_("Show whether GDB will quit " + "when an %s is detected"), + problem->name); + add_setshow_enum_cmd ("quit", class_maintenance, + internal_problem_modes, + &problem->should_quit, + set_doc, + show_doc, + NULL, /* help_doc */ + NULL, /* setfunc */ + NULL, /* showfunc */ + set_cmd_list, + show_cmd_list); + + xfree (set_doc); + xfree (show_doc); + } + + if (problem->user_settable_should_dump_core) + { + set_doc = xstrprintf (_("Set whether GDB should create a core " + "file of GDB when %s is detected"), + problem->name); + show_doc = xstrprintf (_("Show whether GDB will create a core " + "file of GDB when %s is detected"), + problem->name); + add_setshow_enum_cmd ("corefile", class_maintenance, + internal_problem_modes, + &problem->should_dump_core, + set_doc, + show_doc, + NULL, /* help_doc */ + NULL, /* setfunc */ + NULL, /* showfunc */ + set_cmd_list, + show_cmd_list); + + xfree (set_doc); + xfree (show_doc); + } +} + +/* Return a newly allocated string, containing the PREFIX followed + by the system error message for errno (separated by a colon). + + The result must be deallocated after use. */ - xfree (set_doc); - xfree (show_doc); +static char * +perror_string (const char *prefix) +{ + char *err; + char *combined; + + err = safe_strerror (errno); + combined = (char *) xmalloc (strlen (err) + strlen (prefix) + 3); + strcpy (combined, prefix); + strcat (combined, ": "); + strcat (combined, err); + + return combined; } /* Print the system error message for errno, and also mention STRING - as the file name for which the error was encountered. - Then return to command level. */ + as the file name for which the error was encountered. Use ERRCODE + for the thrown exception. Then return to command level. */ void -perror_with_name (const char *string) +throw_perror_with_name (enum errors errcode, const char *string) { - char *err; char *combined; - err = safe_strerror (errno); - combined = (char *) alloca (strlen (err) + strlen (string) + 3); - strcpy (combined, string); - strcat (combined, ": "); - strcat (combined, err); + combined = perror_string (string); + make_cleanup (xfree, combined); /* I understand setting these is a matter of taste. Still, some people may clear errno but not know about bfd_error. Doing this here is not @@ -1101,7 +971,28 @@ perror_with_name (const char *string) bfd_set_error (bfd_error_no_error); errno = 0; - error (_("%s."), combined); + throw_error (errcode, _("%s."), combined); +} + +/* See throw_perror_with_name, ERRCODE defaults here to GENERIC_ERROR. */ + +void +perror_with_name (const char *string) +{ + throw_perror_with_name (GENERIC_ERROR, string); +} + +/* Same as perror_with_name except that it prints a warning instead + of throwing an error. */ + +void +perror_warning_with_name (const char *string) +{ + char *combined; + + combined = perror_string (string); + warning (_("%s"), combined); + xfree (combined); } /* Print the system error message for ERRCODE, and also mention STRING @@ -1130,21 +1021,39 @@ print_sys_errmsg (const char *string, int errcode) void quit (void) { + if (sync_quit_force_run) + { + sync_quit_force_run = 0; + quit_force (NULL, stdin == instream); + } + #ifdef __MSDOS__ /* No steenking SIGINT will ever be coming our way when the program is resumed. Don't lie. */ - fatal ("Quit"); + throw_quit ("Quit"); #else if (job_control /* If there is no terminal switching for this target, then we can't possibly get screwed by the lack of job control. */ - || current_target.to_terminal_ours == NULL) - fatal ("Quit"); + || !target_supports_terminal_ours ()) + throw_quit ("Quit"); else - fatal ("Quit (expect signal SIGINT when the program is resumed)"); + throw_quit ("Quit (expect signal SIGINT when the program is resumed)"); #endif } +/* See defs.h. */ + +void +maybe_quit (void) +{ + if (check_quit_flag () || sync_quit_force_run) + quit (); + if (deprecated_interactive_hook) + deprecated_interactive_hook (); + target_check_pending_interrupt (); +} + /* Called when a memory allocation fails, with the number of bytes of memory requested in SIZE. */ @@ -1186,20 +1095,6 @@ myread (int desc, char *addr, int len) return orglen; } -/* Make a copy of the string at PTR with SIZE characters - (and add a null character at the end in the copy). - Uses malloc to get the space. Returns the address of the copy. */ - -char * -savestring (const char *ptr, size_t size) -{ - char *p = (char *) xmalloc (size + 1); - - memcpy (p, ptr, size); - p[size] = 0; - return p; -} - void print_spaces (int n, struct ui_file *file) { @@ -1209,10 +1104,27 @@ print_spaces (int n, struct ui_file *file) /* Print a host address. */ void -gdb_print_host_address (const void *addr, struct ui_file *stream) +gdb_print_host_address_1 (const void *addr, struct ui_file *stream) { fprintf_filtered (stream, "%s", host_address_to_string (addr)); } + +/* See utils.h. */ + +char * +make_hex_string (const gdb_byte *data, size_t length) +{ + char *result = (char *) xmalloc (length * 2 + 1); + char *p; + size_t i; + + p = result; + for (i = 0; i < length; ++i) + p += xsnprintf (p, 3, "%02x", data[i]); + *p = '\0'; + return result; +} + /* A cleanup function that calls regfree. */ @@ -1220,7 +1132,7 @@ gdb_print_host_address (const void *addr, struct ui_file *stream) static void do_regfree_cleanup (void *r) { - regfree (r); + regfree ((regex_t *) r); } /* Create a new cleanup that frees the compiled regular expression R. */ @@ -1238,12 +1150,35 @@ char * get_regcomp_error (int code, regex_t *rx) { size_t length = regerror (code, rx, NULL, 0); - char *result = xmalloc (length); + char *result = (char *) xmalloc (length); regerror (code, rx, result, length); return result; } +/* Compile a regexp and throw an exception on error. This returns a + cleanup to free the resulting pattern on success. RX must not be + NULL. */ + +struct cleanup * +compile_rx_or_error (regex_t *pattern, const char *rx, const char *message) +{ + int code; + + gdb_assert (rx != NULL); + + code = regcomp (pattern, rx, REG_NOSUB); + if (code != 0) + { + char *err = get_regcomp_error (code, pattern); + + make_cleanup (xfree, err); + error (("%s: %s"), message, err); + } + + return make_regfree_cleanup (pattern); +} + /* This function supports the query, nquery, and yquery functions. @@ -1259,12 +1194,11 @@ get_regcomp_error (int code, regex_t *rx) static int ATTRIBUTE_PRINTF (1, 0) defaulted_query (const char *ctlstr, const char defchar, va_list args) { - int answer; int ans2; int retval; int def_value; char def_answer, not_def_answer; - char *y_string, *n_string, *question; + char *y_string, *n_string, *question, *prompt; /* Used to add duration we waited for user to respond to prompt_for_continue_wait_time. */ struct timeval prompt_started, prompt_ended, prompt_delta; @@ -1324,62 +1258,31 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) /* Format the question outside of the loop, to avoid reusing args. */ question = xstrvprintf (ctlstr, args); + prompt = xstrprintf (_("%s%s(%s or %s) %s"), + annotation_level > 1 ? "\n\032\032pre-query\n" : "", + question, y_string, n_string, + annotation_level > 1 ? "\n\032\032query\n" : ""); + xfree (question); /* Used for calculating time spend waiting for user. */ gettimeofday (&prompt_started, NULL); while (1) { - wrap_here (""); /* Flush any buffered output. */ - gdb_flush (gdb_stdout); - - if (annotation_level > 1) - printf_filtered (("\n\032\032pre-query\n")); - - fputs_filtered (question, gdb_stdout); - printf_filtered (_("(%s or %s) "), y_string, n_string); + char *response, answer; - if (annotation_level > 1) - printf_filtered (("\n\032\032query\n")); - - wrap_here (""); gdb_flush (gdb_stdout); + response = gdb_readline_wrapper (prompt); - answer = fgetc (stdin); - - /* We expect fgetc to block until a character is read. But - this may not be the case if the terminal was opened with - the NONBLOCK flag. In that case, if there is nothing to - read on stdin, fgetc returns EOF, but also sets the error - condition flag on stdin and errno to EAGAIN. With a true - EOF, stdin's error condition flag is not set. - - A situation where this behavior was observed is a pseudo - terminal on AIX. */ - while (answer == EOF && ferror (stdin) && errno == EAGAIN) - { - /* Not a real EOF. Wait a little while and try again until - we read something. */ - clearerr (stdin); - gdb_usleep (10000); - answer = fgetc (stdin); - } - - clearerr (stdin); /* in case of C-d */ - if (answer == EOF) /* C-d */ + if (response == NULL) /* C-d */ { printf_filtered ("EOF [assumed %c]\n", def_answer); retval = def_value; break; } - /* Eat rest of input line, to EOF or newline. */ - if (answer != '\n') - do - { - ans2 = fgetc (stdin); - clearerr (stdin); - } - while (ans2 != EOF && ans2 != '\n' && ans2 != '\r'); + + answer = response[0]; + xfree (response); if (answer >= 'a') answer -= 040; @@ -1394,8 +1297,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) specify the required input or have it default by entering nothing. */ if (answer == def_answer - || (defchar != '\0' && - (answer == '\n' || answer == '\r' || answer == EOF))) + || (defchar != '\0' && answer == '\0')) { retval = def_value; break; @@ -1411,7 +1313,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) timeval_add (&prompt_for_continue_wait_time, &prompt_for_continue_wait_time, &prompt_delta); - xfree (question); + xfree (prompt); if (annotation_level > 1) printf_filtered (("\n\032\032post-query\n")); return retval; @@ -1488,7 +1390,8 @@ host_char_to_target (struct gdbarch *gdbarch, int c, int *target_c) cleanups = make_cleanup_obstack_free (&host_data); convert_between_encodings (target_charset (gdbarch), host_charset (), - &the_char, 1, 1, &host_data, translit_none); + (gdb_byte *) &the_char, 1, 1, + &host_data, translit_none); if (obstack_object_size (&host_data) == 1) { @@ -1516,7 +1419,7 @@ host_char_to_target (struct gdbarch *gdbarch, int c, int *target_c) after the zeros. A value of 0 does not mean end of string. */ int -parse_escape (struct gdbarch *gdbarch, char **string_ptr) +parse_escape (struct gdbarch *gdbarch, const char **string_ptr) { int target_char = -2; /* Initialize to avoid GCC warnings. */ int c = *(*string_ptr)++; @@ -1592,8 +1495,14 @@ parse_escape (struct gdbarch *gdbarch, char **string_ptr) /* Print the character C on STREAM as part of the contents of a literal string whose delimiter is QUOTER. Note that this routine should only - be call for printing things which are independent of the language - of the program being debugged. */ + be called for printing things which are independent of the language + of the program being debugged. + + printchar will normally escape backslashes and instances of QUOTER. If + QUOTER is 0, printchar won't escape backslashes or any quoting character. + As a side effect, if you pass the backslash character as the QUOTER, + printchar will escape backslashes as usual, but not any other quoting + character. */ static void printchar (int c, void (*do_fputs) (const char *, struct ui_file *), @@ -1636,7 +1545,7 @@ printchar (int c, void (*do_fputs) (const char *, struct ui_file *), } else { - if (c == '\\' || c == quoter) + if (quoter != 0 && (c == '\\' || c == quoter)) do_fputs ("\\", stream); do_fprintf (stream, "%c", c); } @@ -1764,12 +1673,17 @@ init_page_info (void) lines_per_page = rows; chars_per_line = cols; - /* Readline should have fetched the termcap entry for us. */ - if (tgetnum ("li") < 0 || getenv ("EMACS")) + /* Readline should have fetched the termcap entry for us. + Only try to use tgetnum function if rl_get_screen_size + did not return a useful value. */ + if (((rows <= 0) && (tgetnum ("li") < 0)) + /* Also disable paging if inside Emacs. $EMACS was used + before Emacs v25.1, $INSIDE_EMACS is used since then. */ + || getenv ("EMACS") || getenv ("INSIDE_EMACS")) { - /* The number of lines per page is not mentioned in the - terminal description. This probably means that paging is - not useful (e.g. emacs shell window), so disable paging. */ + /* The number of lines per page is not mentioned in the terminal + description or EMACS evironment variable is set. This probably + means that paging is not useful, so disable paging. */ lines_per_page = UINT_MAX; } @@ -1779,10 +1693,20 @@ init_page_info (void) #endif } + /* We handle SIGWINCH ourselves. */ + rl_catch_sigwinch = 0; + set_screen_size (); set_width (); } +/* Return nonzero if filtered printing is initialized. */ +int +filtered_printing_initialized (void) +{ + return wrap_buffer != NULL; +} + /* Helper for make_cleanup_restore_page_info. */ static void @@ -1871,6 +1795,18 @@ set_height_command (char *args, int from_tty, struct cmd_list_element *c) set_screen_size (); } +/* See utils.h. */ + +void +set_screen_width_and_height (int width, int height) +{ + lines_per_page = height; + chars_per_line = width; + + set_screen_size (); + set_width (); +} + /* Wait, so the user can read what's on the screen. Prompt the user to continue by pressing RETURN. */ @@ -1900,6 +1836,10 @@ prompt_for_continue (void) immediate_quit++; QUIT; + + /* We'll need to handle input. */ + target_terminal_ours (); + /* On a real operating system, the user can quit with SIGINT. But not on GO32. @@ -1940,6 +1880,24 @@ prompt_for_continue (void) dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */ } +/* Initalize timer to keep track of how long we waited for the user. */ + +void +reset_prompt_for_continue_wait_time (void) +{ + static const struct timeval zero_timeval = { 0 }; + + prompt_for_continue_wait_time = zero_timeval; +} + +/* Fetch the cumulative time spent in prompt_for_continue. */ + +struct timeval +get_prompt_for_continue_wait_time (void) +{ + return prompt_for_continue_wait_time; +} + /* Reinitialize filter; ie. tell it to reset to original values. */ void @@ -2041,7 +1999,7 @@ puts_filtered_tabular (char *string, int width, int right) if (right) spaces += width - stringlen; - spacebuf = alloca (spaces + 1); + spacebuf = (char *) alloca (spaces + 1); spacebuf[spaces] = '\0'; while (spaces--) spacebuf[spaces] = ' '; @@ -2717,25 +2675,12 @@ subset_compare (char *string_to_compare, char *template_string) if (template_string != (char *) NULL && string_to_compare != (char *) NULL && strlen (string_to_compare) <= strlen (template_string)) match = - (strncmp - (template_string, string_to_compare, strlen (string_to_compare)) == 0); + (startswith (template_string, string_to_compare)); else match = 0; return match; } -static void -pagination_on_command (char *arg, int from_tty) -{ - pagination_enabled = 1; -} - -static void -pagination_off_command (char *arg, int from_tty) -{ - pagination_enabled = 0; -} - static void show_debug_timestamp (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -2749,37 +2694,35 @@ void initialize_utils (void) { add_setshow_uinteger_cmd ("width", class_support, &chars_per_line, _("\ -Set number of characters gdb thinks are in a line."), _("\ -Show number of characters gdb thinks are in a line."), NULL, +Set number of characters where GDB should wrap lines of its output."), _("\ +Show number of characters where GDB should wrap lines of its output."), _("\ +This affects where GDB wraps its output to fit the screen width.\n\ +Setting this to \"unlimited\" or zero prevents GDB from wrapping its output."), set_width_command, show_chars_per_line, &setlist, &showlist); add_setshow_uinteger_cmd ("height", class_support, &lines_per_page, _("\ -Set number of lines gdb thinks are in a page."), _("\ -Show number of lines gdb thinks are in a page."), NULL, +Set number of lines in a page for GDB output pagination."), _("\ +Show number of lines in a page for GDB output pagination."), _("\ +This affects the number of lines after which GDB will pause\n\ +its output and ask you whether to continue.\n\ +Setting this to \"unlimited\" or zero causes GDB never pause during output."), set_height_command, show_lines_per_page, &setlist, &showlist); - init_page_info (); - add_setshow_boolean_cmd ("pagination", class_support, &pagination_enabled, _("\ -Set state of pagination."), _("\ -Show state of pagination."), NULL, +Set state of GDB output pagination."), _("\ +Show state of GDB output pagination."), _("\ +When pagination is ON, GDB pauses at end of each screenful of\n\ +its output and asks you whether to continue.\n\ +Turning pagination off is an alternative to \"set height unlimited\"."), NULL, show_pagination_enabled, &setlist, &showlist); - if (xdb_commands) - { - add_com ("am", class_support, pagination_on_command, - _("Enable pagination")); - add_com ("sm", class_support, pagination_off_command, - _("Disable pagination")); - } - add_setshow_boolean_cmd ("sevenbit-strings", class_support, &sevenbit_strings, _("\ Set printing of 8-bit characters in strings as \\nnn."), _("\ @@ -2798,21 +2741,6 @@ When set, debugging messages will be marked with seconds and microseconds."), &setdebuglist, &showdebuglist); } -/* Print routines to handle variable size regs, etc. */ -/* Temporary storage using circular buffer. */ -#define NUMCELLS 16 -#define CELLSIZE 50 -static char * -get_cell (void) -{ - static char buf[NUMCELLS][CELLSIZE]; - static int cell = 0; - - if (++cell >= NUMCELLS) - cell = 0; - return buf[cell]; -} - const char * paddress (struct gdbarch *gdbarch, CORE_ADDR addr) { @@ -2856,7 +2784,7 @@ print_core_address (struct gdbarch *gdbarch, CORE_ADDR address) hashval_t core_addr_hash (const void *ap) { - const CORE_ADDR *addrp = ap; + const CORE_ADDR *addrp = (const CORE_ADDR *) ap; return *addrp; } @@ -2866,284 +2794,12 @@ core_addr_hash (const void *ap) int core_addr_eq (const void *ap, const void *bp) { - const CORE_ADDR *addr_ap = ap; - const CORE_ADDR *addr_bp = bp; + const CORE_ADDR *addr_ap = (const CORE_ADDR *) ap; + const CORE_ADDR *addr_bp = (const CORE_ADDR *) bp; return *addr_ap == *addr_bp; } -static char * -decimal2str (char *sign, ULONGEST addr, int width) -{ - /* Steal code from valprint.c:print_decimal(). Should this worry - about the real size of addr as the above does? */ - unsigned long temp[3]; - char *str = get_cell (); - int i = 0; - - do - { - temp[i] = addr % (1000 * 1000 * 1000); - addr /= (1000 * 1000 * 1000); - i++; - width -= 9; - } - while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0]))); - - width += 9; - if (width < 0) - width = 0; - - switch (i) - { - case 1: - xsnprintf (str, CELLSIZE, "%s%0*lu", sign, width, temp[0]); - break; - case 2: - xsnprintf (str, CELLSIZE, "%s%0*lu%09lu", sign, width, - temp[1], temp[0]); - break; - case 3: - xsnprintf (str, CELLSIZE, "%s%0*lu%09lu%09lu", sign, width, - temp[2], temp[1], temp[0]); - break; - default: - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); - } - - return str; -} - -static char * -octal2str (ULONGEST addr, int width) -{ - unsigned long temp[3]; - char *str = get_cell (); - int i = 0; - - do - { - temp[i] = addr % (0100000 * 0100000); - addr /= (0100000 * 0100000); - i++; - width -= 10; - } - while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0]))); - - width += 10; - if (width < 0) - width = 0; - - switch (i) - { - case 1: - if (temp[0] == 0) - xsnprintf (str, CELLSIZE, "%*o", width, 0); - else - xsnprintf (str, CELLSIZE, "0%0*lo", width, temp[0]); - break; - case 2: - xsnprintf (str, CELLSIZE, "0%0*lo%010lo", width, temp[1], temp[0]); - break; - case 3: - xsnprintf (str, CELLSIZE, "0%0*lo%010lo%010lo", width, - temp[2], temp[1], temp[0]); - break; - default: - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); - } - - return str; -} - -char * -pulongest (ULONGEST u) -{ - return decimal2str ("", u, 0); -} - -char * -plongest (LONGEST l) -{ - if (l < 0) - return decimal2str ("-", -l, 0); - else - return decimal2str ("", l, 0); -} - -/* Eliminate warning from compiler on 32-bit systems. */ -static int thirty_two = 32; - -char * -phex (ULONGEST l, int sizeof_l) -{ - char *str; - - switch (sizeof_l) - { - case 8: - str = get_cell (); - xsnprintf (str, CELLSIZE, "%08lx%08lx", - (unsigned long) (l >> thirty_two), - (unsigned long) (l & 0xffffffff)); - break; - case 4: - str = get_cell (); - xsnprintf (str, CELLSIZE, "%08lx", (unsigned long) l); - break; - case 2: - str = get_cell (); - xsnprintf (str, CELLSIZE, "%04x", (unsigned short) (l & 0xffff)); - break; - default: - str = phex (l, sizeof (l)); - break; - } - - return str; -} - -char * -phex_nz (ULONGEST l, int sizeof_l) -{ - char *str; - - switch (sizeof_l) - { - case 8: - { - unsigned long high = (unsigned long) (l >> thirty_two); - - str = get_cell (); - if (high == 0) - xsnprintf (str, CELLSIZE, "%lx", - (unsigned long) (l & 0xffffffff)); - else - xsnprintf (str, CELLSIZE, "%lx%08lx", high, - (unsigned long) (l & 0xffffffff)); - break; - } - case 4: - str = get_cell (); - xsnprintf (str, CELLSIZE, "%lx", (unsigned long) l); - break; - case 2: - str = get_cell (); - xsnprintf (str, CELLSIZE, "%x", (unsigned short) (l & 0xffff)); - break; - default: - str = phex_nz (l, sizeof (l)); - break; - } - - return str; -} - -/* Converts a LONGEST to a C-format hexadecimal literal and stores it - in a static string. Returns a pointer to this string. */ -char * -hex_string (LONGEST num) -{ - char *result = get_cell (); - - xsnprintf (result, CELLSIZE, "0x%s", phex_nz (num, sizeof (num))); - return result; -} - -/* Converts a LONGEST number to a C-format hexadecimal literal and - stores it in a static string. Returns a pointer to this string - that is valid until the next call. The number is padded on the - left with 0s to at least WIDTH characters. */ -char * -hex_string_custom (LONGEST num, int width) -{ - char *result = get_cell (); - char *result_end = result + CELLSIZE - 1; - const char *hex = phex_nz (num, sizeof (num)); - int hex_len = strlen (hex); - - if (hex_len > width) - width = hex_len; - if (width + 2 >= CELLSIZE) - internal_error (__FILE__, __LINE__, _("\ -hex_string_custom: insufficient space to store result")); - - strcpy (result_end - width - 2, "0x"); - memset (result_end - width, '0', width); - strcpy (result_end - hex_len, hex); - return result_end - width - 2; -} - -/* Convert VAL to a numeral in the given radix. For - * radix 10, IS_SIGNED may be true, indicating a signed quantity; - * otherwise VAL is interpreted as unsigned. If WIDTH is supplied, - * it is the minimum width (0-padded if needed). USE_C_FORMAT means - * to use C format in all cases. If it is false, then 'x' - * and 'o' formats do not include a prefix (0x or leading 0). */ - -char * -int_string (LONGEST val, int radix, int is_signed, int width, - int use_c_format) -{ - switch (radix) - { - case 16: - { - char *result; - - if (width == 0) - result = hex_string (val); - else - result = hex_string_custom (val, width); - if (! use_c_format) - result += 2; - return result; - } - case 10: - { - if (is_signed && val < 0) - return decimal2str ("-", -val, width); - else - return decimal2str ("", val, width); - } - case 8: - { - char *result = octal2str (val, width); - - if (use_c_format || val == 0) - return result; - else - return result + 1; - } - default: - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); - } -} - -/* Convert a CORE_ADDR into a string. */ -const char * -core_addr_to_string (const CORE_ADDR addr) -{ - char *str = get_cell (); - - strcpy (str, "0x"); - strcat (str, phex (addr, sizeof (addr))); - return str; -} - -const char * -core_addr_to_string_nz (const CORE_ADDR addr) -{ - char *str = get_cell (); - - strcpy (str, "0x"); - strcat (str, phex_nz (addr, sizeof (addr))); - return str; -} - /* Convert a string back into a CORE_ADDR. */ CORE_ADDR string_to_core_addr (const char *my_string) @@ -3182,104 +2838,51 @@ string_to_core_addr (const char *my_string) return addr; } -const char * -host_address_to_string (const void *addr) -{ - char *str = get_cell (); - - xsnprintf (str, CELLSIZE, "0x%s", phex_nz ((uintptr_t) addr, sizeof (addr))); - return str; -} - char * gdb_realpath (const char *filename) { - /* Method 1: The system has a compile time upper bound on a filename - path. Use that and realpath() to canonicalize the name. This is - the most common case. Note that, if there isn't a compile time - upper bound, you want to avoid realpath() at all costs. */ -#if defined(HAVE_REALPATH) - { -# if defined (PATH_MAX) - char buf[PATH_MAX]; -# define USE_REALPATH -# elif defined (MAXPATHLEN) - char buf[MAXPATHLEN]; -# define USE_REALPATH -# endif -# if defined (USE_REALPATH) - const char *rp = realpath (filename, buf); - - if (rp == NULL) - rp = filename; - return xstrdup (rp); -# endif - } -#endif /* HAVE_REALPATH */ - - /* Method 2: The host system (i.e., GNU) has the function - canonicalize_file_name() which malloc's a chunk of memory and - returns that, use that. */ -#if defined(HAVE_CANONICALIZE_FILE_NAME) - { - char *rp = canonicalize_file_name (filename); - - if (rp == NULL) - return xstrdup (filename); - else - return rp; - } -#endif - - /* FIXME: cagney/2002-11-13: - - Method 2a: Use realpath() with a NULL buffer. Some systems, due - to the problems described in method 3, have modified their - realpath() implementation so that it will allocate a buffer when - NULL is passed in. Before this can be used, though, some sort of - configure time test would need to be added. Otherwize the code - will likely core dump. */ - - /* Method 3: Now we're getting desperate! The system doesn't have a - compile time buffer size and no alternative function. Query the - OS, using pathconf(), for the buffer limit. Care is needed - though, some systems do not limit PATH_MAX (return -1 for - pathconf()) making it impossible to pass a correctly sized buffer - to realpath() (it could always overflow). On those systems, we - skip this. */ -#if defined (HAVE_REALPATH) && defined (HAVE_UNISTD_H) && defined(HAVE_ALLOCA) - { - /* Find out the max path size. */ - long path_max = pathconf ("/", _PC_PATH_MAX); - - if (path_max > 0) - { - /* PATH_MAX is bounded. */ - char *buf = alloca (path_max); - char *rp = realpath (filename, buf); +/* On most hosts, we rely on canonicalize_file_name to compute + the FILENAME's realpath. + + But the situation is slightly more complex on Windows, due to some + versions of GCC which were reported to generate paths where + backlashes (the directory separator) were doubled. For instance: + c:\\some\\double\\slashes\\dir + ... instead of ... + c:\some\double\slashes\dir + Those double-slashes were getting in the way when comparing paths, + for instance when trying to insert a breakpoint as follow: + (gdb) b c:/some/double/slashes/dir/foo.c:4 + No source file named c:/some/double/slashes/dir/foo.c:4. + (gdb) b c:\some\double\slashes\dir\foo.c:4 + No source file named c:\some\double\slashes\dir\foo.c:4. + To prevent this from happening, we need this function to always + strip those extra backslashes. While canonicalize_file_name does + perform this simplification, it only works when the path is valid. + Since the simplification would be useful even if the path is not + valid (one can always set a breakpoint on a file, even if the file + does not exist locally), we rely instead on GetFullPathName to + perform the canonicalization. */ - return xstrdup (rp ? rp : filename); - } - } -#endif - - /* The MS Windows method. If we don't have realpath, we assume we - don't have symlinks and just canonicalize to a Windows absolute - path. GetFullPath converts ../ and ./ in relative paths to - absolute paths, filling in current drive if one is not given - or using the current directory of a specified drive (eg, "E:foo"). - It also converts all forward slashes to back slashes. */ - /* The file system is case-insensitive but case-preserving. - So we do not lowercase the path. Otherwise, we might not - be able to display the original casing in a given path. */ #if defined (_WIN32) { char buf[MAX_PATH]; DWORD len = GetFullPathName (filename, MAX_PATH, buf, NULL); + /* The file system is case-insensitive but case-preserving. + So it is important we do not lowercase the path. Otherwise, + we might not be able to display the original casing in a given + path. */ if (len > 0 && len < MAX_PATH) return xstrdup (buf); } +#else + { + char *rp = canonicalize_file_name (filename); + + if (rp != NULL) + return rp; + } #endif /* This system is a lost cause, just dup the buffer. */ @@ -3290,7 +2893,7 @@ gdb_realpath (const char *filename) by gdb_realpath. */ char * -xfullpath (const char *filename) +gdb_realpath_keepfile (const char *filename) { const char *base_name = lbasename (filename); char *dir_name; @@ -3302,7 +2905,7 @@ xfullpath (const char *filename) if (base_name == filename) return xstrdup (filename); - dir_name = alloca ((size_t) (base_name - filename + 2)); + dir_name = (char *) alloca ((size_t) (base_name - filename + 2)); /* Allocate enough space to store the dir_name + plus one extra character sometimes needed under Windows (see below), and then the closing \000 character. */ @@ -3332,75 +2935,30 @@ xfullpath (const char *filename) return result; } +/* Return PATH in absolute form, performing tilde-expansion if necessary. + PATH cannot be NULL or the empty string. + This does not resolve symlinks however, use gdb_realpath for that. + Space for the result is allocated with malloc. + If the path is already absolute, it is strdup'd. + If there is a problem computing the absolute path, the path is returned + unchanged (still strdup'd). */ + +char * +gdb_abspath (const char *path) +{ + gdb_assert (path != NULL && path[0] != '\0'); -/* This is the 32-bit CRC function used by the GNU separate debug - facility. An executable may contain a section named - .gnu_debuglink, which holds the name of a separate executable file - containing its debug info, and a checksum of that file's contents, - computed using this function. */ -unsigned long -gnu_debuglink_crc32 (unsigned long crc, unsigned char *buf, size_t len) -{ - static const unsigned int crc32_table[256] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, - 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, - 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, - 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, - 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, - 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, - 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, - 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, - 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, - 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, - 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, - 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, - 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, - 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, - 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, - 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, - 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, - 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, - 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, - 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, - 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, - 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, - 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, - 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, - 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, - 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, - 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, - 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, - 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, - 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, - 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, - 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, - 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, - 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, - 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, - 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, - 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, - 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, - 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, - 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, - 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, - 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, - 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, - 0x2d02ef8d - }; - unsigned char *end; - - crc = ~crc & 0xffffffff; - for (end = buf + len; buf < end; ++buf) - crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); - return ~crc & 0xffffffff; + if (path[0] == '~') + return tilde_expand (path); + + if (IS_ABSOLUTE_PATH (path)) + return xstrdup (path); + + /* Beware the // my son, the Emacs barfs, the botch that catch... */ + return concat (current_directory, + IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) + ? "" : SLASH_STRING, + path, (char *) NULL); } ULONGEST @@ -3425,7 +2983,7 @@ align_down (ULONGEST v, int n) void * hashtab_obstack_allocate (void *data, size_t size, size_t count) { - unsigned int total = size * count; + size_t total = size * count; void *ptr = obstack_alloc ((struct obstack *) data, total); memset (ptr, 0, total); @@ -3443,105 +3001,6 @@ dummy_obstack_deallocate (void *object, void *data) return; } -/* The bit offset of the highest byte in a ULONGEST, for overflow - checking. */ - -#define HIGH_BYTE_POSN ((sizeof (ULONGEST) - 1) * HOST_CHAR_BIT) - -/* True (non-zero) iff DIGIT is a valid digit in radix BASE, - where 2 <= BASE <= 36. */ - -static int -is_digit_in_base (unsigned char digit, int base) -{ - if (!isalnum (digit)) - return 0; - if (base <= 10) - return (isdigit (digit) && digit < base + '0'); - else - return (isdigit (digit) || tolower (digit) < base - 10 + 'a'); -} - -static int -digit_to_int (unsigned char c) -{ - if (isdigit (c)) - return c - '0'; - else - return tolower (c) - 'a' + 10; -} - -/* As for strtoul, but for ULONGEST results. */ - -ULONGEST -strtoulst (const char *num, const char **trailer, int base) -{ - unsigned int high_part; - ULONGEST result; - int minus = 0; - int i = 0; - - /* Skip leading whitespace. */ - while (isspace (num[i])) - i++; - - /* Handle prefixes. */ - if (num[i] == '+') - i++; - else if (num[i] == '-') - { - minus = 1; - i++; - } - - if (base == 0 || base == 16) - { - if (num[i] == '0' && (num[i + 1] == 'x' || num[i + 1] == 'X')) - { - i += 2; - if (base == 0) - base = 16; - } - } - - if (base == 0 && num[i] == '0') - base = 8; - - if (base == 0) - base = 10; - - if (base < 2 || base > 36) - { - errno = EINVAL; - return 0; - } - - result = high_part = 0; - for (; is_digit_in_base (num[i], base); i += 1) - { - result = result * base + digit_to_int (num[i]); - high_part = high_part * base + (unsigned int) (result >> HIGH_BYTE_POSN); - result &= ((ULONGEST) 1 << HIGH_BYTE_POSN) - 1; - if (high_part > 0xff) - { - errno = ERANGE; - result = ~ (ULONGEST) 0; - high_part = 0; - minus = 0; - break; - } - } - - if (trailer != NULL) - *trailer = &num[i]; - - result = result + ((ULONGEST) high_part << HIGH_BYTE_POSN); - if (minus) - return -result; - else - return result; -} - /* Simple, portable version of dirname that does not modify its argument. */ @@ -3557,7 +3016,7 @@ ldirname (const char *filename) if (base == filename) return NULL; - dirname = xmalloc (base - filename + 2); + dirname = (char *) xmalloc (base - filename + 2); memcpy (dirname, filename, base - filename); /* On DOS based file systems, convert "d:foo" to "d:.", so that we @@ -3623,7 +3082,7 @@ gdb_bfd_errmsg (bfd_error_type error_tag, char **matching) + strlen (AMBIGUOUS_MESS2); for (p = matching; *p; p++) ret_len += strlen (*p) + 1; - ret = xmalloc (ret_len + 1); + ret = (char *) xmalloc (ret_len + 1); retp = ret; make_cleanup (xfree, ret); @@ -3648,7 +3107,7 @@ gdb_bfd_errmsg (bfd_error_type error_tag, char **matching) /* Return ARGS parsed as a valid pid, or throw an error. */ int -parse_pid_to_attach (char *args) +parse_pid_to_attach (const char *args) { unsigned long pid; char *dummy; @@ -3656,7 +3115,7 @@ parse_pid_to_attach (char *args) if (!args) error_no_arg (_("process-id to attach")); - dummy = args; + dummy = (char *) args; pid = strtoul (args, &dummy, 0); /* Some targets don't set errno on errors, grrr! */ if ((pid == 0 && dummy == args) || dummy != &args[strlen (args)]) @@ -3689,41 +3148,52 @@ make_bpstat_clear_actions_cleanup (void) int producer_is_gcc_ge_4 (const char *producer) { - const char *cs; int major, minor; - if (producer == NULL) - { - /* For unknown compilers expect their behavior is not compliant. For GCC - this case can also happen for -gdwarf-4 type units supported since - gcc-4.5. */ + if (! producer_is_gcc (producer, &major, &minor)) + return -1; + if (major < 4) + return -1; + if (major > 4) + return INT_MAX; + return minor; +} - return -1; - } +/* Returns nonzero if the given PRODUCER string is GCC and sets the MAJOR + and MINOR versions when not NULL. Returns zero if the given PRODUCER + is NULL or it isn't GCC. */ - /* Skip any identifier after "GNU " - such as "C++" or "Java". */ +int +producer_is_gcc (const char *producer, int *major, int *minor) +{ + const char *cs; - if (strncmp (producer, "GNU ", strlen ("GNU ")) != 0) + if (producer != NULL && startswith (producer, "GNU ")) { - /* For non-GCC compilers expect their behavior is not compliant. */ + int maj, min; - return -1; - } - cs = &producer[strlen ("GNU ")]; - while (*cs && !isdigit (*cs)) - cs++; - if (sscanf (cs, "%d.%d", &major, &minor) != 2) - { - /* Not recognized as GCC. */ + if (major == NULL) + major = &maj; + if (minor == NULL) + minor = &min; - return -1; + /* Skip any identifier after "GNU " - such as "C11" "C++" or "Java". + A full producer string might look like: + "GNU C 4.7.2" + "GNU Fortran 4.8.2 20140120 (Red Hat 4.8.2-16) -mtune=generic ..." + "GNU C++14 5.0.0 20150123 (experimental)" + */ + cs = &producer[strlen ("GNU ")]; + while (*cs && !isspace (*cs)) + cs++; + if (*cs && isspace (*cs)) + cs++; + if (sscanf (cs, "%d.%d", major, minor) == 2) + return 1; } - if (major < 4) - return -1; - if (major > 4) - return INT_MAX; - return minor; + /* Not recognized as GCC. */ + return 0; } /* Helper for make_cleanup_free_char_ptr_vec. */ @@ -3731,7 +3201,7 @@ producer_is_gcc_ge_4 (const char *producer) static void do_free_char_ptr_vec (void *arg) { - VEC (char_ptr) *char_ptr_vec = arg; + VEC (char_ptr) *char_ptr_vec = (VEC (char_ptr) *) arg; free_char_ptr_vec (char_ptr_vec); } @@ -3774,7 +3244,8 @@ substitute_path_component (char **stringp, const char *from, const char *to) { char *string_new; - string_new = xrealloc (string, (strlen (string) + to_len + 1)); + string_new + = (char *) xrealloc (string, (strlen (string) + to_len + 1)); /* Relocate the current S pointer. */ s = s - string + string_new; @@ -3835,9 +3306,9 @@ wait_to_die_with_timeout (pid_t pid, int *status, int timeout) sa.sa_flags = 0; sigaction (SIGALRM, &sa, &old_sa); #else - void (*ofunc) (); + sighandler_t ofunc; - ofunc = (void (*)()) signal (SIGALRM, sigalrm_handler); + ofunc = signal (SIGALRM, sigalrm_handler); #endif alarm (timeout); @@ -3885,14 +3356,14 @@ gdb_filename_fnmatch (const char *pattern, const char *string, int flags) /* Replace '\' by '/' in both strings. */ - pattern_slash = alloca (strlen (pattern) + 1); + pattern_slash = (char *) alloca (strlen (pattern) + 1); strcpy (pattern_slash, pattern); pattern = pattern_slash; for (; *pattern_slash != 0; pattern_slash++) if (IS_DIR_SEPARATOR (*pattern_slash)) *pattern_slash = '/'; - string_slash = alloca (strlen (string) + 1); + string_slash = (char *) alloca (strlen (string) + 1); strcpy (string_slash, string); string = string_slash; for (; *string_slash != 0; string_slash++) @@ -3916,4 +3387,5 @@ _initialize_utils (void) { add_internal_problem_command (&internal_error_problem); add_internal_problem_command (&internal_warning_problem); + add_internal_problem_command (&demangler_warning_problem); }