X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Futils.c;h=aaaf9c5d678153b800a7e6504c297360d5ced706;hb=422d944b03535efba6187bbd9e35e87f73767dd7;hp=99b0e7693c9f089b37caff314912cdd9e74436a4;hpb=5ac79d781168059f9afca94d939000578e6e483a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/utils.c b/gdb/utils.c index 99b0e7693c..aaaf9c5d67 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1,8 +1,6 @@ /* General utility routines for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -20,12 +18,16 @@ along with this program. If not, see . */ #include "defs.h" -#include "gdb_assert.h" +#include "dyn-string.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" +#ifdef HAVE_SYS_RESOURCE_H +#include +#endif /* HAVE_SYS_RESOURCE_H */ #ifdef TUI #include "tui/tui.h" /* For tui_get_command_dimension. */ @@ -35,17 +37,13 @@ #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" #include "serial.h" #include "bfd.h" #include "target.h" -#include "demangle.h" +#include "gdb-demangle.h" #include "expression.h" #include "language.h" #include "charset.h" @@ -55,11 +53,11 @@ #include "gdb_obstack.h" #include "gdbcore.h" #include "top.h" +#include "main.h" +#include "solist.h" #include "inferior.h" /* for signed_pointer_to_address */ -#include /* For MAXPATHLEN */ - #include "gdb_curses.h" #include "readline/readline.h" @@ -67,6 +65,10 @@ #include #include +#include "gdb_usleep.h" +#include "interps.h" +#include "gdb_regex.h" + #if !HAVE_DECL_MALLOC extern PTR malloc (); /* ARI: PTR */ #endif @@ -77,43 +79,36 @@ extern PTR realloc (); /* ARI: PTR */ extern void free (); #endif -/* readline defines this. */ -#undef savestring - void (*deprecated_error_begin_hook) (void); /* Prototypes for local functions */ static void vfprintf_maybe_filtered (struct ui_file *, const char *, - va_list, int) ATTR_FORMAT (printf, 2, 0); + va_list, int) ATTRIBUTE_PRINTF (2, 0); static void fputs_maybe_filtered (const char *, struct ui_file *, int); -static void do_my_cleanups (struct cleanup **, struct cleanup *); - static void prompt_for_continue (void); static void set_screen_size (void); static void set_width (void); -/* A flag indicating whether to timestamp debugging messages. */ +/* Time spent in prompt_for_continue in the currently executing command + waiting for user to respond. + Initialized in make_command_stats_cleanup. + Modified in prompt_for_continue and defaulted_query. + Used in report_command_stats. */ -static int debug_timestamp = 0; +static struct timeval prompt_for_continue_wait_time; -/* Chain of cleanup actions established with make_cleanup, - to be executed if an error happens. */ +/* A flag indicating whether to timestamp debugging messages. */ -static struct cleanup *cleanup_chain; /* cleaned up after a failed command */ -static struct cleanup *final_cleanup_chain; /* cleaned up when gdb exits */ +static int debug_timestamp = 0; -/* Nonzero if we have job control. */ +/* Nonzero if we have job control. */ int job_control; -/* Nonzero means a quit has been requested. */ - -int quit_flag; - /* 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 @@ -127,33 +122,6 @@ int quit_flag; int immediate_quit; -/* Nonzero means that encoded C++/ObjC names should be printed out in their - C++/ObjC form rather than raw. */ - -int demangle = 1; -static void -show_demangle (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) -{ - fprintf_filtered (file, _("\ -Demangling of encoded C++/ObjC names when displaying symbols is %s.\n"), - value); -} - -/* Nonzero means that encoded C++/ObjC names should be printed out in their - C++/ObjC form even in assembler language displays. If this is set, but - DEMANGLE is zero, names are printed raw, i.e. DEMANGLE controls. */ - -int asm_demangle = 0; -static void -show_asm_demangle (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) -{ - fprintf_filtered (file, _("\ -Demangling of C++/ObjC names in disassembly listings is %s.\n"), - value); -} - /* 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.) */ @@ -163,19 +131,11 @@ static void show_sevenbit_strings (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - fprintf_filtered (file, _("\ -Printing of 8-bit characters in strings as \\nnn is %s.\n"), + fprintf_filtered (file, _("Printing of 8-bit characters " + "in strings as \\nnn is %s.\n"), 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: "; @@ -189,52 +149,44 @@ show_pagination_enabled (struct ui_file *file, int from_tty, } +/* Cleanup utilities. -/* Add a new cleanup to the cleanup_chain, - and return the previous chain pointer - to be passed later to do_cleanups or discard_cleanups. - Args are FUNCTION to clean up with, and ARG to pass to it. */ - -struct cleanup * -make_cleanup (make_cleanup_ftype *function, void *arg) -{ - return make_my_cleanup (&cleanup_chain, function, arg); -} + These are not defined in cleanups.c (nor declared in cleanups.h) + because while they use the "cleanup API" they are not part of the + "cleanup API". */ -struct cleanup * -make_cleanup_dtor (make_cleanup_ftype *function, void *arg, - void (*dtor) (void *)) +static void +do_freeargv (void *arg) { - return make_my_cleanup2 (&cleanup_chain, - function, arg, dtor); + freeargv ((char **) arg); } struct cleanup * -make_final_cleanup (make_cleanup_ftype *function, void *arg) +make_cleanup_freeargv (char **arg) { - return make_my_cleanup (&final_cleanup_chain, function, arg); + return make_cleanup (do_freeargv, arg); } static void -do_freeargv (void *arg) +do_dyn_string_delete (void *arg) { - freeargv ((char **) arg); + dyn_string_delete ((dyn_string_t) arg); } struct cleanup * -make_cleanup_freeargv (char **arg) +make_cleanup_dyn_string_delete (dyn_string_t arg) { - return make_my_cleanup (&cleanup_chain, do_freeargv, arg); + return make_cleanup (do_dyn_string_delete, arg); } static void do_bfd_close_cleanup (void *arg) { - bfd_close (arg); + gdb_bfd_unref (arg); } struct cleanup * -make_cleanup_bfd_close (bfd *abfd) +make_cleanup_bfd_unref (bfd *abfd) { return make_cleanup (do_bfd_close_cleanup, abfd); } @@ -243,6 +195,7 @@ static void do_close_cleanup (void *arg) { int *fd = arg; + close (*fd); } @@ -250,6 +203,7 @@ 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); } @@ -260,7 +214,8 @@ static void do_fclose_cleanup (void *arg) { FILE *file = arg; - fclose (arg); + + fclose (file); } /* Return a new cleanup that closes FILE. */ @@ -277,6 +232,7 @@ static void do_obstack_free (void *arg) { struct obstack *ob = arg; + obstack_free (ob, NULL); } @@ -297,7 +253,27 @@ do_ui_file_delete (void *arg) struct cleanup * make_cleanup_ui_file_delete (struct ui_file *arg) { - return make_my_cleanup (&cleanup_chain, do_ui_file_delete, arg); + return make_cleanup (do_ui_file_delete, arg); +} + +/* Helper function for make_cleanup_ui_out_redirect_pop. */ + +static void +do_ui_out_redirect_pop (void *arg) +{ + struct ui_out *uiout = arg; + + if (ui_out_redirect (uiout, NULL) < 0) + warning (_("Cannot restore redirection of the current output protocol")); +} + +/* Return a new cleanup that pops the last redirection by ui_out_redirect + with NULL parameter. */ + +struct cleanup * +make_cleanup_ui_out_redirect_pop (struct ui_out *uiout) +{ + return make_cleanup (do_ui_out_redirect_pop, uiout); } static void @@ -309,7 +285,7 @@ do_free_section_addr_info (void *arg) struct cleanup * make_cleanup_free_section_addr_info (struct section_addr_info *addrs) { - return make_my_cleanup (&cleanup_chain, do_free_section_addr_info, addrs); + return make_cleanup (do_free_section_addr_info, addrs); } struct restore_integer_closure @@ -322,436 +298,210 @@ static void restore_integer (void *p) { struct restore_integer_closure *closure = p; + *(closure->variable) = closure->value; } -/* Remember the current value of *VARIABLE and make it restored when the cleanup - is run. */ +/* Remember the current value of *VARIABLE and make it restored when + the cleanup is run. */ + struct cleanup * make_cleanup_restore_integer (int *variable) { struct restore_integer_closure *c = xmalloc (sizeof (struct restore_integer_closure)); + c->variable = variable; c->value = *variable; - return make_my_cleanup2 (&cleanup_chain, restore_integer, (void *)c, - xfree); + return make_cleanup_dtor (restore_integer, (void *) c, xfree); } -struct cleanup * -make_my_cleanup2 (struct cleanup **pmy_chain, make_cleanup_ftype *function, - void *arg, void (*free_arg) (void *)) -{ - struct cleanup *new - = (struct cleanup *) xmalloc (sizeof (struct cleanup)); - struct cleanup *old_chain = *pmy_chain; - - new->next = *pmy_chain; - new->function = function; - new->free_arg = free_arg; - new->arg = arg; - *pmy_chain = new; - - return old_chain; -} +/* Remember the current value of *VARIABLE and make it restored when + the cleanup is run. */ struct cleanup * -make_my_cleanup (struct cleanup **pmy_chain, make_cleanup_ftype *function, - void *arg) +make_cleanup_restore_uinteger (unsigned int *variable) { - return make_my_cleanup2 (pmy_chain, function, arg, NULL); + return make_cleanup_restore_integer ((int *) variable); } -/* Discard cleanups and do the actions they describe - until we get back to the point OLD_CHAIN in the cleanup_chain. */ +/* Helper for make_cleanup_unpush_target. */ -void -do_cleanups (struct cleanup *old_chain) +static void +do_unpush_target (void *arg) { - do_my_cleanups (&cleanup_chain, old_chain); -} + struct target_ops *ops = arg; -void -do_final_cleanups (struct cleanup *old_chain) -{ - do_my_cleanups (&final_cleanup_chain, old_chain); + unpush_target (ops); } -static void -do_my_cleanups (struct cleanup **pmy_chain, - struct cleanup *old_chain) +/* Return a new cleanup that unpushes OPS. */ + +struct cleanup * +make_cleanup_unpush_target (struct target_ops *ops) { - struct cleanup *ptr; - while ((ptr = *pmy_chain) != old_chain) - { - *pmy_chain = ptr->next; /* Do this first incase recursion */ - (*ptr->function) (ptr->arg); - if (ptr->free_arg) - (*ptr->free_arg) (ptr->arg); - xfree (ptr); - } + return make_cleanup (do_unpush_target, ops); } -/* Discard cleanups, not doing the actions they describe, - until we get back to the point OLD_CHAIN in the cleanup_chain. */ +/* Helper for make_cleanup_htab_delete compile time checking the types. */ -void -discard_cleanups (struct cleanup *old_chain) +static void +do_htab_delete_cleanup (void *htab_voidp) { - discard_my_cleanups (&cleanup_chain, old_chain); -} + htab_t htab = htab_voidp; -void -discard_final_cleanups (struct cleanup *old_chain) -{ - discard_my_cleanups (&final_cleanup_chain, old_chain); + htab_delete (htab); } -void -discard_my_cleanups (struct cleanup **pmy_chain, - struct cleanup *old_chain) -{ - struct cleanup *ptr; - while ((ptr = *pmy_chain) != old_chain) - { - *pmy_chain = ptr->next; - if (ptr->free_arg) - (*ptr->free_arg) (ptr->arg); - xfree (ptr); - } -} +/* Return a new cleanup that deletes HTAB. */ -/* Set the cleanup_chain to 0, and return the old cleanup chain. */ struct cleanup * -save_cleanups (void) +make_cleanup_htab_delete (htab_t htab) { - return save_my_cleanups (&cleanup_chain); + return make_cleanup (do_htab_delete_cleanup, htab); } -struct cleanup * -save_final_cleanups (void) +struct restore_ui_file_closure { - return save_my_cleanups (&final_cleanup_chain); -} + struct ui_file **variable; + struct ui_file *value; +}; -struct cleanup * -save_my_cleanups (struct cleanup **pmy_chain) +static void +do_restore_ui_file (void *p) { - struct cleanup *old_chain = *pmy_chain; + struct restore_ui_file_closure *closure = p; - *pmy_chain = 0; - return old_chain; -} - -/* Restore the cleanup chain from a previously saved chain. */ -void -restore_cleanups (struct cleanup *chain) -{ - restore_my_cleanups (&cleanup_chain, chain); + *(closure->variable) = closure->value; } -void -restore_final_cleanups (struct cleanup *chain) -{ - restore_my_cleanups (&final_cleanup_chain, chain); -} +/* Remember the current value of *VARIABLE and make it restored when + the cleanup is run. */ -void -restore_my_cleanups (struct cleanup **pmy_chain, struct cleanup *chain) +struct cleanup * +make_cleanup_restore_ui_file (struct ui_file **variable) { - *pmy_chain = chain; -} + struct restore_ui_file_closure *c = XNEW (struct restore_ui_file_closure); -/* This function is useful for cleanups. - Do + c->variable = variable; + c->value = *variable; - foo = xmalloc (...); - old_chain = make_cleanup (free_current_contents, &foo); + return make_cleanup_dtor (do_restore_ui_file, (void *) c, xfree); +} - to arrange to free the object thus allocated. */ +/* Helper for make_cleanup_value_free_to_mark. */ -void -free_current_contents (void *ptr) +static void +do_value_free_to_mark (void *value) { - void **location = ptr; - if (location == NULL) - internal_error (__FILE__, __LINE__, - _("free_current_contents: NULL pointer")); - if (*location != NULL) - { - xfree (*location); - *location = NULL; - } + value_free_to_mark ((struct value *) value); } -/* Provide a known function that does nothing, to use as a base for - for a possibly long chain of cleanups. This is useful where we - use the cleanup chain for handling normal cleanups as well as dealing - with cleanups that need to be done as a result of a call to error(). - In such cases, we may not be certain where the first cleanup is, unless - we have a do-nothing one to always use as the base. */ +/* Free all values allocated since MARK was obtained by value_mark + (except for those released) when the cleanup is run. */ -void -null_cleanup (void *arg) +struct cleanup * +make_cleanup_value_free_to_mark (struct value *mark) { + return make_cleanup (do_value_free_to_mark, mark); } -/* Continuations are implemented as cleanups internally. Inherit from - cleanups. */ -struct continuation -{ - struct cleanup base; -}; +/* Helper for make_cleanup_value_free. */ -/* Add a continuation to the continuation list of THREAD. The new - continuation will be added at the front. */ -void -add_continuation (struct thread_info *thread, - void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) +static void +do_value_free (void *value) { - struct cleanup *as_cleanup = &thread->continuations->base; - make_cleanup_ftype *continuation_hook_fn = continuation_hook; - - make_my_cleanup2 (&as_cleanup, - continuation_hook_fn, - args, - continuation_free_args); - - thread->continuations = (struct continuation *) as_cleanup; + value_free (value); } -/* Add a continuation to the continuation list of INFERIOR. The new - continuation will be added at the front. */ +/* Free VALUE. */ -void -add_inferior_continuation (void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) +struct cleanup * +make_cleanup_value_free (struct value *value) { - struct inferior *inf = current_inferior (); - struct cleanup *as_cleanup = &inf->continuations->base; - make_cleanup_ftype *continuation_hook_fn = continuation_hook; - - make_my_cleanup2 (&as_cleanup, - continuation_hook_fn, - args, - continuation_free_args); - - inf->continuations = (struct continuation *) as_cleanup; + return make_cleanup (do_value_free, value); } -/* Do all continuations of the current inferior. */ +/* Helper for make_cleanup_free_so. */ -void -do_all_inferior_continuations (void) +static void +do_free_so (void *arg) { - struct cleanup *old_chain; - struct cleanup *as_cleanup; - struct inferior *inf = current_inferior (); - - if (inf->continuations == NULL) - return; - - /* Copy the list header into another pointer, and set the global - list header to null, so that the global list can change as a side - effect of invoking the continuations and the processing of the - preexisting continuations will not be affected. */ + struct so_list *so = arg; - as_cleanup = &inf->continuations->base; - inf->continuations = NULL; - - /* Work now on the list we have set aside. */ - do_my_cleanups (&as_cleanup, NULL); + free_so (so); } -/* Get rid of all the inferior-wide continuations of INF. */ +/* Make cleanup handler calling free_so for SO. */ -void -discard_all_inferior_continuations (struct inferior *inf) +struct cleanup * +make_cleanup_free_so (struct so_list *so) { - struct cleanup *continuation_ptr = &inf->continuations->base; - discard_my_cleanups (&continuation_ptr, NULL); - inf->continuations = NULL; + return make_cleanup (do_free_so, so); } -static void -restore_thread_cleanup (void *arg) -{ - ptid_t *ptid_p = arg; - switch_to_thread (*ptid_p); -} +/* Helper for make_cleanup_restore_current_language. */ -/* Walk down the continuation list of PTID, and execute all the - continuations. There is a problem though. In some cases new - continuations may be added while we are in the middle of this loop. - If this happens they will be added in the front, and done before we - have a chance of exhausting those that were already there. We need - to then save the beginning of the list in a pointer and do the - continuations from there on, instead of using the global beginning - of list as our iteration pointer. */ static void -do_all_continuations_ptid (ptid_t ptid, - struct continuation **continuations_p) +do_restore_current_language (void *p) { - struct cleanup *old_chain; - ptid_t current_thread; - struct cleanup *as_cleanup; - - if (*continuations_p == NULL) - return; + enum language saved_lang = (uintptr_t) p; - current_thread = inferior_ptid; - - /* Restore selected thread on exit. Don't try to restore the frame - as well, because: - - - When running continuations, the selected frame is always #0. - - - The continuations may trigger symbol file loads, which may - change the frame layout (frame ids change), which would trigger - a warning if we used make_cleanup_restore_current_thread. */ - - old_chain = make_cleanup (restore_thread_cleanup, ¤t_thread); - - /* Let the continuation see this thread as selected. */ - switch_to_thread (ptid); - - /* Copy the list header into another pointer, and set the global - list header to null, so that the global list can change as a side - effect of invoking the continuations and the processing of the - preexisting continuations will not be affected. */ - - as_cleanup = &(*continuations_p)->base; - *continuations_p = NULL; - - /* Work now on the list we have set aside. */ - do_my_cleanups (&as_cleanup, NULL); - - do_cleanups (old_chain); + set_language (saved_lang); } -/* Callback for iterate over threads. */ -static int -do_all_continuations_thread_callback (struct thread_info *thread, void *data) -{ - do_all_continuations_ptid (thread->ptid, &thread->continuations); - return 0; -} +/* Remember the current value of CURRENT_LANGUAGE and make it restored when + the cleanup is run. */ -/* Do all continuations of thread THREAD. */ -void -do_all_continuations_thread (struct thread_info *thread) +struct cleanup * +make_cleanup_restore_current_language (void) { - do_all_continuations_thread_callback (thread, NULL); -} + enum language saved_lang = current_language->la_language; -/* Do all continuations of all threads. */ -void -do_all_continuations (void) -{ - iterate_over_threads (do_all_continuations_thread_callback, NULL); + return make_cleanup (do_restore_current_language, + (void *) (uintptr_t) saved_lang); } -/* Callback for iterate over threads. */ -static int -discard_all_continuations_thread_callback (struct thread_info *thread, - void *data) -{ - struct cleanup *continuation_ptr = &thread->continuations->base; - discard_my_cleanups (&continuation_ptr, NULL); - thread->continuations = NULL; - return 0; -} +/* Helper function for make_cleanup_clear_parser_state. */ -/* Get rid of all the continuations of THREAD. */ -void -discard_all_continuations_thread (struct thread_info *thread) +static void +do_clear_parser_state (void *ptr) { - discard_all_continuations_thread_callback (thread, NULL); -} + struct parser_state **p = (struct parser_state **) ptr; -/* Get rid of all the continuations of all threads. */ -void -discard_all_continuations (void) -{ - iterate_over_threads (discard_all_continuations_thread_callback, NULL); + *p = NULL; } +/* Clean (i.e., set to NULL) the parser state variable P. */ -/* Add a continuation to the intermediate continuation list of THREAD. - The new continuation will be added at the front. */ -void -add_intermediate_continuation (struct thread_info *thread, - void (*continuation_hook) - (void *), void *args, - void (*continuation_free_args) (void *)) -{ - struct cleanup *as_cleanup = &thread->intermediate_continuations->base; - make_cleanup_ftype *continuation_hook_fn = continuation_hook; - - make_my_cleanup2 (&as_cleanup, - continuation_hook_fn, - args, - continuation_free_args); - - thread->intermediate_continuations = (struct continuation *) as_cleanup; -} - -/* Walk down the cmd_continuation list, and execute all the - continuations. There is a problem though. In some cases new - continuations may be added while we are in the middle of this - loop. If this happens they will be added in the front, and done - before we have a chance of exhausting those that were already - there. We need to then save the beginning of the list in a pointer - and do the continuations from there on, instead of using the - global beginning of list as our iteration pointer.*/ -static int -do_all_intermediate_continuations_thread_callback (struct thread_info *thread, - void *data) +struct cleanup * +make_cleanup_clear_parser_state (struct parser_state **p) { - do_all_continuations_ptid (thread->ptid, - &thread->intermediate_continuations); - return 0; + return make_cleanup (do_clear_parser_state, (void *) p); } -/* Do all intermediate continuations of thread THREAD. */ -void -do_all_intermediate_continuations_thread (struct thread_info *thread) -{ - do_all_intermediate_continuations_thread_callback (thread, NULL); -} +/* This function is useful for cleanups. + Do -/* Do all intermediate continuations of all threads. */ -void -do_all_intermediate_continuations (void) -{ - iterate_over_threads (do_all_intermediate_continuations_thread_callback, NULL); -} + foo = xmalloc (...); + old_chain = make_cleanup (free_current_contents, &foo); -/* Callback for iterate over threads. */ -static int -discard_all_intermediate_continuations_thread_callback (struct thread_info *thread, - void *data) -{ - struct cleanup *continuation_ptr = &thread->intermediate_continuations->base; - discard_my_cleanups (&continuation_ptr, NULL); - thread->intermediate_continuations = NULL; - return 0; -} + to arrange to free the object thus allocated. */ -/* Get rid of all the intermediate continuations of THREAD. */ void -discard_all_intermediate_continuations_thread (struct thread_info *thread) +free_current_contents (void *ptr) { - discard_all_intermediate_continuations_thread_callback (thread, NULL); -} + void **location = ptr; -/* Get rid of all the intermediate continuations of all threads. */ -void -discard_all_intermediate_continuations (void) -{ - iterate_over_threads (discard_all_intermediate_continuations_thread_callback, NULL); + if (location == NULL) + internal_error (__FILE__, __LINE__, + _("free_current_contents: NULL pointer")); + if (*location != NULL) + { + xfree (*location); + *location = NULL; + } } @@ -769,77 +519,118 @@ 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. */ -NORETURN void +void verror (const char *string, va_list args) { throw_verror (GENERIC_ERROR, string, args); } -NORETURN void -error (const char *string, ...) +void +error_stream (struct ui_file *stream) { - va_list args; - va_start (args, string); - throw_verror (GENERIC_ERROR, string, args); - va_end (args); + char *message = ui_file_xstrdup (stream, NULL); + + make_cleanup (xfree, message); + error (("%s"), message); } -/* 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. */ +/* Emit a message and abort. */ + +static void ATTRIBUTE_NORETURN +abort_with_message (const char *msg) +{ + if (gdb_stderr == NULL) + fputs (msg, stderr); + else + fputs_unfiltered (msg, gdb_stderr); -NORETURN void -vfatal (const char *string, va_list args) + abort (); /* NOTE: GDB has only three calls to abort(). */ +} + +/* Dump core trying to increase the core soft limit to hard limit first. */ + +void +dump_core (void) { - throw_vfatal (string, args); +#ifdef HAVE_SETRLIMIT + struct rlimit rlim = { RLIM_INFINITY, RLIM_INFINITY }; + + setrlimit (RLIMIT_CORE, &rlim); +#endif /* HAVE_SETRLIMIT */ + + abort (); /* NOTE: GDB has only three calls to abort(). */ } -NORETURN void -fatal (const char *string, ...) +/* Check whether GDB will be able to dump core using the dump_core + 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. */ + +int +can_dump_core (enum resource_limit_kind limit_kind) { - va_list args; - va_start (args, string); - throw_vfatal (string, args); - va_end (args); +#ifdef HAVE_GETRLIMIT + struct rlimit rlim; + + /* Be quiet and assume we can dump if an error is returned. */ + if (getrlimit (RLIMIT_CORE, &rlim) != 0) + return 1; + + switch (limit_kind) + { + 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; } -NORETURN void -error_stream (struct ui_file *stream) +/* Print a warning that we cannot dump core. */ + +void +warn_cant_dump_core (const char *reason) { - long len; - char *message = ui_file_xstrdup (stream, &len); - make_cleanup (xfree, message); - error (("%s"), message); + 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 @@ -848,23 +639,24 @@ error_stream (struct ui_file *stream) const char internal_problem_ask[] = "ask"; const char internal_problem_yes[] = "yes"; const char internal_problem_no[] = "no"; -static const char *internal_problem_modes[] = +static const char *const internal_problem_modes[] = { internal_problem_ask, internal_problem_yes, internal_problem_no, NULL }; -static const char *internal_problem_mode = internal_problem_ask; -/* Print a message reporting an internal error/warning. Ask the user +/* Print a message reporting an internal error/warning. Ask the user if they want to continue, dump core, or just exit. Return something to indicate a quit. */ 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; }; @@ -872,7 +664,7 @@ struct internal_problem has been reported, and assuming GDB didn't quit, the caller can either allow execution to resume or throw an error. */ -static void ATTR_FORMAT (printf, 4, 0) +static void ATTRIBUTE_PRINTF (4, 0) internal_vproblem (struct internal_problem *problem, const char *file, int line, const char *fmt, va_list ap) { @@ -880,10 +672,12 @@ 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. */ { static char msg[] = "Recursive internal problem.\n"; + switch (dejavu) { case 0: @@ -891,8 +685,7 @@ internal_vproblem (struct internal_problem *problem, break; case 1: dejavu = 2; - fputs_unfiltered (msg, gdb_stderr); - abort (); /* NOTE: GDB has only four calls to abort(). */ + abort_with_message (msg); default: dejavu = 3; /* Newer GLIBC versions put the warn_unused_result attribute @@ -901,15 +694,11 @@ internal_vproblem (struct internal_problem *problem, does not fix this problem. This is the solution suggested at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509. */ if (write (STDERR_FILENO, msg, sizeof (msg)) != sizeof (msg)) - abort (); /* NOTE: GDB has only four calls to abort(). */ + abort (); /* NOTE: GDB has only three calls to abort(). */ exit (1); } } - /* 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 @@ -917,21 +706,44 @@ internal_vproblem (struct internal_problem *problem, so that the user knows that they are living on the edge. */ { char *msg; + msg = xstrvprintf (fmt, ap); - reason = xstrprintf ("\ -%s:%d: %s: %s\n\ -A problem internal to GDB has been detected,\n\ -further debugging may prove unreliable.", file, line, problem->name, msg); + reason = xstrprintf ("%s:%d: %s: %s\n" + "A problem internal to GDB has been detected,\n" + "further debugging may prove unreliable.", + file, line, problem->name, msg); xfree (msg); 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. */ - quit_p = query (_("%s\nQuit this debugging session? "), reason); + if (!confirm || !filtered_printing_initialized ()) + quit_p = 1; + else + quit_p = query (_("%s\nQuit this debugging session? "), reason); } else if (problem->should_quit == internal_problem_yes) quit_p = 1; @@ -940,15 +752,28 @@ further debugging may prove unreliable.", file, line, problem->name, msg); 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) { - /* Default (yes/batch case) is to dump core. This leaves a GDB - `dropping' so that it is easier to see that something went - wrong in GDB. */ - dump_core_p = query (_("%s\nCreate a core file of GDB? "), 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 + `dropping' so that it is easier to see that something went + wrong in GDB. */ + dump_core_p = query (_("%s\nCreate a core file of GDB? "), reason); + } } else if (problem->should_dump_core == internal_problem_yes) - dump_core_p = 1; + dump_core_p = can_dump_core_warn (LIMIT_MAX, reason); else if (problem->should_dump_core == internal_problem_no) dump_core_p = 0; else @@ -957,7 +782,7 @@ further debugging may prove unreliable.", file, line, problem->name, msg); if (quit_p) { if (dump_core_p) - abort (); /* NOTE: GDB has only four calls to abort(). */ + dump_core (); else exit (1); } @@ -967,36 +792,28 @@ further debugging may prove unreliable.", file, line, problem->name, msg); { #ifdef HAVE_WORKING_FORK if (fork () == 0) - abort (); /* NOTE: GDB has only four calls to abort(). */ + dump_core (); #endif } } 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 }; -NORETURN void +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); -} - -NORETURN void -internal_error (const char *file, int line, const char *string, ...) -{ - va_list ap; - va_start (ap, string); - internal_verror (file, line, string, ap); - va_end (ap); + throw_quit (_("Command aborted.")); } static struct internal_problem internal_warning_problem = { - "internal-warning", internal_problem_ask, internal_problem_ask + "internal-warning", 1, internal_problem_ask, 1, internal_problem_ask }; void @@ -1005,12 +822,23 @@ internal_vwarning (const char *file, int line, const char *fmt, va_list ap) internal_vproblem (&internal_warning_problem, file, line, fmt, ap); } +static struct internal_problem demangler_warning_problem = { + "demangler-warning", 1, internal_problem_ask, 0, internal_problem_no +}; + +void +demangler_vwarning (const char *file, int line, const char *fmt, va_list 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); } @@ -1063,73 +891,124 @@ add_internal_problem_command (struct internal_problem *problem) add_prefix_cmd ((char*) problem->name, class_maintenance, set_internal_problem_cmd, set_doc, set_cmd_list, - concat ("maintenance set ", problem->name, " ", NULL), + concat ("maintenance set ", problem->name, " ", + (char *) NULL), 0/*allow-unknown*/, &maintenance_set_cmdlist); add_prefix_cmd ((char*) problem->name, class_maintenance, show_internal_problem_cmd, show_doc, show_cmd_list, - concat ("maintenance show ", problem->name, " ", NULL), + concat ("maintenance show ", problem->name, " ", + (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); - - 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); + } } -/* 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. */ +/* Return a newly allocated string, containing the PREFIX followed + by the system error message for errno (separated by a colon). -NORETURN void -perror_with_name (const char *string) + The result must be deallocated after use. */ + +static char * +perror_string (const char *prefix) { char *err; char *combined; err = safe_strerror (errno); - combined = (char *) alloca (strlen (err) + strlen (string) + 3); - strcpy (combined, string); + 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. Use ERRCODE + for the thrown exception. Then return to command level. */ + +void +throw_perror_with_name (enum errors errcode, const char *string) +{ + char *combined; + + 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 - unreasonable. */ + unreasonable. */ 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 @@ -1158,27 +1037,33 @@ 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 } /* Called when a memory allocation fails, with the number of bytes of - memory requested in SIZE. */ + memory requested in SIZE. */ -NORETURN void -nomem (long size) +void +malloc_failure (long size) { if (size > 0) { @@ -1192,191 +1077,112 @@ nomem (long size) } } -/* The xmalloc() (libiberty.h) family of memory management routines. - - These are like the ISO-C malloc() family except that they implement - consistent semantics and guard against typical memory management - problems. */ - -/* NOTE: These are declared using PTR to ensure consistency with - "libiberty.h". xfree() is GDB local. */ +/* My replacement for the read system call. + Used like `read' but keeps going if `read' returns too soon. */ -PTR /* ARI: PTR */ -xmalloc (size_t size) +int +myread (int desc, char *addr, int len) { - void *val; - - /* See libiberty/xmalloc.c. This function need's to match that's - semantics. It never returns NULL. */ - if (size == 0) - size = 1; - - val = malloc (size); /* ARI: malloc */ - if (val == NULL) - nomem (size); + int val; + int orglen = len; - return (val); + while (len > 0) + { + val = read (desc, addr, len); + if (val < 0) + return val; + if (val == 0) + return orglen - len; + len -= val; + addr += val; + } + return orglen; } -void * -xzalloc (size_t size) +void +print_spaces (int n, struct ui_file *file) { - return xcalloc (1, size); + fputs_unfiltered (n_spaces (n), file); } -PTR /* ARI: PTR */ -xrealloc (PTR ptr, size_t size) /* ARI: PTR */ -{ - void *val; - - /* See libiberty/xmalloc.c. This function need's to match that's - semantics. It never returns NULL. */ - if (size == 0) - size = 1; - - if (ptr != NULL) - val = realloc (ptr, size); /* ARI: realloc */ - else - val = malloc (size); /* ARI: malloc */ - if (val == NULL) - nomem (size); - - return (val); -} +/* Print a host address. */ -PTR /* ARI: PTR */ -xcalloc (size_t number, size_t size) +void +gdb_print_host_address (const void *addr, struct ui_file *stream) { - void *mem; + fprintf_filtered (stream, "%s", host_address_to_string (addr)); +} - /* See libiberty/xmalloc.c. This function need's to match that's - semantics. It never returns NULL. */ - if (number == 0 || size == 0) - { - number = 1; - size = 1; - } +/* See utils.h. */ - mem = calloc (number, size); /* ARI: xcalloc */ - if (mem == NULL) - nomem (number * size); +char * +make_hex_string (const gdb_byte *data, size_t length) +{ + char *result = xmalloc (length * 2 + 1); + char *p; + size_t i; - return mem; + p = result; + for (i = 0; i < length; ++i) + p += xsnprintf (p, 3, "%02x", data[i]); + *p = '\0'; + return result; } -void -xfree (void *ptr) -{ - if (ptr != NULL) - free (ptr); /* ARI: free */ -} -/* Like asprintf/vasprintf but get an internal_error if the call - fails. */ +/* A cleanup function that calls regfree. */ -char * -xstrprintf (const char *format, ...) +static void +do_regfree_cleanup (void *r) { - char *ret; - va_list args; - va_start (args, format); - ret = xstrvprintf (format, args); - va_end (args); - return ret; + regfree (r); } -void -xasprintf (char **ret, const char *format, ...) -{ - va_list args; - va_start (args, format); - (*ret) = xstrvprintf (format, args); - va_end (args); -} +/* Create a new cleanup that frees the compiled regular expression R. */ -void -xvasprintf (char **ret, const char *format, va_list ap) +struct cleanup * +make_regfree_cleanup (regex_t *r) { - (*ret) = xstrvprintf (format, ap); + return make_cleanup (do_regfree_cleanup, r); } -char * -xstrvprintf (const char *format, va_list ap) -{ - char *ret = NULL; - int status = vasprintf (&ret, format, ap); - /* NULL is returned when there was a memory allocation problem, or - any other error (for instance, a bad format string). A negative - status (the printed length) with a non-NULL buffer should never - happen, but just to be sure. */ - if (ret == NULL || status < 0) - internal_error (__FILE__, __LINE__, _("vasprintf call failed")); - return ret; -} +/* Return an xmalloc'd error message resulting from a regular + expression compilation failure. */ -int -xsnprintf (char *str, size_t size, const char *format, ...) +char * +get_regcomp_error (int code, regex_t *rx) { - va_list args; - int ret; - - va_start (args, format); - ret = vsnprintf (str, size, format, args); - gdb_assert (ret < size); - va_end (args); + size_t length = regerror (code, rx, NULL, 0); + char *result = xmalloc (length); - return ret; + regerror (code, rx, result, length); + return result; } -/* My replacement for the read system call. - Used like `read' but keeps going if `read' returns too soon. */ +/* 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. */ -int -myread (int desc, char *addr, int len) +struct cleanup * +compile_rx_or_error (regex_t *pattern, const char *rx, const char *message) { - int val; - int orglen = len; + int code; - while (len > 0) + gdb_assert (rx != NULL); + + code = regcomp (pattern, rx, REG_NOSUB); + if (code != 0) { - val = read (desc, addr, len); - if (val < 0) - return val; - if (val == 0) - return orglen - len; - len -= val; - addr += val; - } - 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 *err = get_regcomp_error (code, pattern); -char * -savestring (const char *ptr, size_t size) -{ - char *p = (char *) xmalloc (size + 1); - memcpy (p, ptr, size); - p[size] = 0; - return p; -} + make_cleanup (xfree, err); + error (("%s: %s"), message, err); + } -void -print_spaces (int n, struct ui_file *file) -{ - fputs_unfiltered (n_spaces (n), file); + return make_regfree_cleanup (pattern); } -/* Print a host address. */ - -void -gdb_print_host_address (const void *addr, struct ui_file *stream) -{ - fprintf_filtered (stream, "%s", host_address_to_string (addr)); -} /* This function supports the query, nquery, and yquery functions. @@ -1389,15 +1195,17 @@ gdb_print_host_address (const void *addr, struct ui_file *stream) ARGS are the arguments passed along with the CTLSTR argument to printf. */ -static int ATTR_FORMAT (printf, 1, 0) +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; /* Set up according to which answer is the default. */ if (defchar == '\0') @@ -1426,12 +1234,12 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) } /* Automatically answer the default value if the user did not want - prompts. */ - if (! caution) + prompts or the command was issued with the server prefix. */ + if (!confirm || server_command) return def_value; /* If input isn't coming from the user directly, just say what - question we're asking, and then answer "yes" automatically. This + question we're asking, and then answer the default automatically. This way, important error messages don't get lost when talking to GDB over a pipe. */ if (! input_from_terminal_p ()) @@ -1439,18 +1247,14 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) wrap_here (""); vfprintf_filtered (gdb_stdout, ctlstr, args); - printf_filtered (_("(%s or %s) [answered %c; input not from terminal]\n"), + printf_filtered (_("(%s or %s) [answered %c; " + "input not from terminal]\n"), y_string, n_string, def_answer); gdb_flush (gdb_stdout); return def_value; } - /* Automatically answer the default value if input is not from the user - directly, or if the user did not want prompts. */ - if (!input_from_terminal_p () || !caution) - return def_value; - if (deprecated_query_hook) { return deprecated_query_hook (ctlstr, args); @@ -1458,40 +1262,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")); + char *response, answer; - fputs_filtered (question, gdb_stdout); - printf_filtered (_("(%s or %s) "), y_string, n_string); - - if (annotation_level > 1) - printf_filtered (("\n\032\032query\n")); - - wrap_here (""); gdb_flush (gdb_stdout); + response = gdb_readline_wrapper (prompt); - 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; @@ -1506,8 +1301,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; @@ -1517,7 +1311,13 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) y_string, n_string); } - xfree (question); + /* Add time spend in this routine to prompt_for_continue_wait_time. */ + gettimeofday (&prompt_ended, NULL); + timeval_sub (&prompt_delta, &prompt_ended, &prompt_started); + timeval_add (&prompt_for_continue_wait_time, + &prompt_for_continue_wait_time, &prompt_delta); + + xfree (prompt); if (annotation_level > 1) printf_filtered (("\n\032\032post-query\n")); return retval; @@ -1534,10 +1334,12 @@ int nquery (const char *ctlstr, ...) { va_list args; + int ret; va_start (args, ctlstr); - return defaulted_query (ctlstr, 'n', args); + ret = defaulted_query (ctlstr, 'n', args); va_end (args); + return ret; } /* Ask user a y-or-n question and return 0 if answer is no, 1 if @@ -1550,10 +1352,12 @@ int yquery (const char *ctlstr, ...) { va_list args; + int ret; va_start (args, ctlstr); - return defaulted_query (ctlstr, 'y', args); + ret = defaulted_query (ctlstr, 'y', args); va_end (args); + return ret; } /* Ask user a y-or-n question and return 1 iff answer is yes. @@ -1565,10 +1369,12 @@ int query (const char *ctlstr, ...) { va_list args; + int ret; va_start (args, ctlstr); - return defaulted_query (ctlstr, '\0', args); + ret = defaulted_query (ctlstr, '\0', args); va_end (args); + return ret; } /* A helper for parse_escape that converts a host character to a @@ -1577,7 +1383,7 @@ query (const char *ctlstr, ...) function returns 1. Otherwise, the function returns 0. */ static int -host_char_to_target (int c, int *target_c) +host_char_to_target (struct gdbarch *gdbarch, int c, int *target_c) { struct obstack host_data; char the_char = c; @@ -1587,8 +1393,9 @@ host_char_to_target (int c, int *target_c) obstack_init (&host_data); cleanups = make_cleanup_obstack_free (&host_data); - convert_between_encodings (target_charset (), host_charset (), - &the_char, 1, 1, &host_data, translit_none); + convert_between_encodings (target_charset (gdbarch), host_charset (), + (gdb_byte *) &the_char, 1, 1, + &host_data, translit_none); if (obstack_object_size (&host_data) == 1) { @@ -1616,10 +1423,11 @@ host_char_to_target (int c, int *target_c) after the zeros. A value of 0 does not mean end of string. */ int -parse_escape (char **string_ptr) +parse_escape (struct gdbarch *gdbarch, const char **string_ptr) { - int target_char = -2; /* initialize to avoid GCC warnings */ + int target_char = -2; /* Initialize to avoid GCC warnings. */ int c = *(*string_ptr)++; + switch (c) { case '\n': @@ -1682,25 +1490,29 @@ parse_escape (char **string_ptr) break; } - if (!host_char_to_target (c, &target_char)) - error - ("The escape sequence `\%c' is equivalent to plain `%c', which" - " has no equivalent\n" "in the `%s' character set.", c, c, - target_charset ()); + if (!host_char_to_target (gdbarch, c, &target_char)) + error (_("The escape sequence `\\%c' is equivalent to plain `%c'," + " which has no equivalent\nin the `%s' character set."), + c, c, target_charset (gdbarch)); return target_char; } /* 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. */ + 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 *), void (*do_fprintf) (struct ui_file *, const char *, ...) ATTRIBUTE_FPTR_PRINTF_2, struct ui_file *stream, int quoter) { - c &= 0xFF; /* Avoid sign bit follies */ if (c < 0x20 || /* Low control chars */ @@ -1737,7 +1549,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); } @@ -1746,7 +1558,7 @@ printchar (int c, void (*do_fputs) (const char *, struct ui_file *), /* Print the character C on STREAM as part of the contents of a literal string whose delimiter is QUOTER. Note that these routines should only be call for printing things which are independent of - the language of the program being debugged. */ + the language of the program being debugged. */ void fputstr_filtered (const char *str, int quoter, struct ui_file *stream) @@ -1767,6 +1579,7 @@ fputstrn_filtered (const char *str, int n, int quoter, struct ui_file *stream) { int i; + for (i = 0; i < n; i++) printchar (str[i], fputs_filtered, fprintf_filtered, stream, quoter); } @@ -1776,6 +1589,7 @@ fputstrn_unfiltered (const char *str, int n, int quoter, struct ui_file *stream) { int i; + for (i = 0; i < n; i++) printchar (str[i], fputs_unfiltered, fprintf_unfiltered, stream, quoter); } @@ -1787,8 +1601,8 @@ static void show_lines_per_page (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - fprintf_filtered (file, _("\ -Number of lines gdb thinks are in a page is %s.\n"), + fprintf_filtered (file, + _("Number of lines gdb thinks are in a page is %s.\n"), value); } @@ -1798,8 +1612,9 @@ static void show_chars_per_line (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - fprintf_filtered (file, _("\ -Number of characters gdb thinks are in a line is %s.\n"), + fprintf_filtered (file, + _("Number of characters gdb thinks " + "are in a line is %s.\n"), value); } @@ -1836,6 +1651,12 @@ static int wrap_column; void init_page_info (void) { + if (batch_flag) + { + lines_per_page = UINT_MAX; + chars_per_line = UINT_MAX; + } + else #if defined(TUI) if (!tui_get_command_dimension (&chars_per_line, &lines_per_page)) #endif @@ -1856,30 +1677,77 @@ 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. */ + || getenv ("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; } - /* FIXME: Get rid of this junk. */ -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) - SIGWINCH_HANDLER (SIGWINCH); -#endif - /* If the output is not a terminal, don't paginate it. */ if (!ui_file_isatty (gdb_stdout)) lines_per_page = UINT_MAX; #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 +do_restore_page_info_cleanup (void *arg) +{ set_screen_size (); set_width (); } +/* Provide cleanup for restoring the terminal size. */ + +struct cleanup * +make_cleanup_restore_page_info (void) +{ + struct cleanup *back_to; + + back_to = make_cleanup (do_restore_page_info_cleanup, NULL); + make_cleanup_restore_uinteger (&lines_per_page); + make_cleanup_restore_uinteger (&chars_per_line); + + return back_to; +} + +/* Temporarily set BATCH_FLAG and the associated unlimited terminal size. + Provide cleanup for restoring the original state. */ + +struct cleanup * +set_batch_flag_and_make_cleanup_restore_page_info (void) +{ + struct cleanup *back_to = make_cleanup_restore_page_info (); + + make_cleanup_restore_integer (&batch_flag); + batch_flag = 1; + init_page_info (); + + return back_to; +} + /* Set the screen size based on LINES_PER_PAGE and CHARS_PER_LINE. */ static void @@ -1930,6 +1798,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. */ @@ -1938,6 +1818,11 @@ prompt_for_continue (void) { char *ignore; char cont_prompt[120]; + /* Used to add duration we waited for user to respond to + prompt_for_continue_wait_time. */ + struct timeval prompt_started, prompt_ended, prompt_delta; + + gettimeofday (&prompt_started, NULL); if (annotation_level > 1) printf_unfiltered (("\n\032\032pre-prompt-for-continue\n")); @@ -1953,6 +1838,11 @@ prompt_for_continue (void) reinitialize_more_filter (); 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. @@ -1965,16 +1855,23 @@ prompt_for_continue (void) out to DOS. */ ignore = gdb_readline_wrapper (cont_prompt); + /* Add time spend in this routine to prompt_for_continue_wait_time. */ + gettimeofday (&prompt_ended, NULL); + timeval_sub (&prompt_delta, &prompt_ended, &prompt_started); + timeval_add (&prompt_for_continue_wait_time, + &prompt_for_continue_wait_time, &prompt_delta); + if (annotation_level > 1) printf_unfiltered (("\n\032\032post-prompt-for-continue\n")); if (ignore) { char *p = ignore; + while (*p == ' ' || *p == '\t') ++p; if (p[0] == 'q') - async_request_quit (0); + quit (); xfree (ignore); } immediate_quit--; @@ -1983,7 +1880,25 @@ prompt_for_continue (void) need to save the ---Type --- line at the top of the screen. */ reinitialize_more_filter (); - dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */ + 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. */ @@ -1996,7 +1911,7 @@ reinitialize_more_filter (void) } /* Indicate that if the next sequence of characters overflows the line, - a newline should be inserted here rather than when it hits the end. + a newline should be inserted here rather than when it hits the end. If INDENT is non-null, it is a string to be printed to indent the wrapped part on the next line. INDENT must remain accessible until the next call to wrap_here() or until a newline is printed through @@ -2019,9 +1934,10 @@ reinitialize_more_filter (void) void wrap_here (char *indent) { - /* This should have been allocated, but be paranoid anyway. */ + /* This should have been allocated, but be paranoid anyway. */ if (!wrap_buffer) - internal_error (__FILE__, __LINE__, _("failed internal consistency check")); + internal_error (__FILE__, __LINE__, + _("failed internal consistency check")); if (wrap_buffer[0]) { @@ -2030,7 +1946,7 @@ wrap_here (char *indent) } wrap_pointer = wrap_buffer; wrap_buffer[0] = '\0'; - if (chars_per_line == UINT_MAX) /* No line overflow checking */ + if (chars_per_line == UINT_MAX) /* No line overflow checking. */ { wrap_column = 0; } @@ -2052,11 +1968,11 @@ wrap_here (char *indent) } /* Print input string to gdb_stdout, filtered, with wrap, - arranging strings in columns of n chars. String can be + arranging strings in columns of n chars. String can be right or left justified in the column. Never prints trailing spaces. String should never be longer than width. FIXME: this could be useful for the EXAMINE - command, which currently doesn't tabulate very well */ + command, which currently doesn't tabulate very well. */ void puts_filtered_tabular (char *string, int width, int right) @@ -2097,9 +2013,9 @@ puts_filtered_tabular (char *string, int width, int right) /* Ensure that whatever gets printed next, using the filtered output - commands, starts at the beginning of the line. I.E. if there is + commands, starts at the beginning of the line. I.e. if there is any pending output for the current line, flush it and start a new - line. Otherwise do nothing. */ + line. Otherwise do nothing. */ void begin_line (void) @@ -2134,8 +2050,12 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream, return; /* Don't do any filtering if it is disabled. */ - if ((stream != gdb_stdout) || !pagination_enabled - || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) + if (stream != gdb_stdout + || !pagination_enabled + || batch_flag + || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX) + || top_level_interpreter () == NULL + || ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ()))) { fputs_unfiltered (linebuffer, stream); return; @@ -2193,16 +2113,16 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream, if (lines_printed >= lines_per_page - 1) prompt_for_continue (); - /* Now output indentation and wrapped string */ + /* Now output indentation and wrapped string. */ if (wrap_column) { fputs_unfiltered (wrap_indent, stream); - *wrap_pointer = '\0'; /* Null-terminate saved stuff */ - fputs_unfiltered (wrap_buffer, stream); /* and eject it */ + *wrap_pointer = '\0'; /* Null-terminate saved stuff, */ + fputs_unfiltered (wrap_buffer, stream); /* and eject it. */ /* FIXME, this strlen is what prevents wrap_indent from containing tabs. However, if we recurse to print it and count its chars, we risk trouble if wrap_indent is - longer than (the user settable) chars_per_line. + longer than (the user settable) chars_per_line. Note also that this can set chars_printed > chars_per_line if we are printing a long string. */ chars_printed = strlen (wrap_indent) @@ -2217,7 +2137,8 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream, if (*lineptr == '\n') { chars_printed = 0; - wrap_here ((char *) 0); /* Spit out chars, cancel further wraps */ + wrap_here ((char *) 0); /* Spit out chars, cancel + further wraps. */ lines_printed++; fputc_unfiltered ('\n', stream); lineptr++; @@ -2235,6 +2156,7 @@ int putchar_unfiltered (int c) { char buf = c; + ui_file_write (gdb_stdout, &buf, 1); return c; } @@ -2252,6 +2174,7 @@ int fputc_unfiltered (int c, struct ui_file *stream) { char buf = c; + ui_file_write (stream, &buf, 1); return c; } @@ -2433,6 +2356,7 @@ void fprintf_filtered (struct ui_file *stream, const char *format, ...) { va_list args; + va_start (args, format); vfprintf_filtered (stream, format, args); va_end (args); @@ -2442,6 +2366,7 @@ void fprintf_unfiltered (struct ui_file *stream, const char *format, ...) { va_list args; + va_start (args, format); vfprintf_unfiltered (stream, format, args); va_end (args); @@ -2455,6 +2380,7 @@ fprintfi_filtered (int spaces, struct ui_file *stream, const char *format, ...) { va_list args; + va_start (args, format); print_spaces_filtered (spaces, stream); @@ -2467,6 +2393,7 @@ void printf_filtered (const char *format, ...) { va_list args; + va_start (args, format); vfprintf_filtered (gdb_stdout, format, args); va_end (args); @@ -2477,6 +2404,7 @@ void printf_unfiltered (const char *format, ...) { va_list args; + va_start (args, format); vfprintf_unfiltered (gdb_stdout, format, args); va_end (args); @@ -2489,6 +2417,7 @@ void printfi_filtered (int spaces, const char *format, ...) { va_list args; + va_start (args, format); print_spaces_filtered (spaces, gdb_stdout); vfprintf_filtered (gdb_stdout, format, args); @@ -2547,10 +2476,10 @@ print_spaces_filtered (int n, struct ui_file *stream) /* fprintf_symbol_filtered attempts to demangle NAME, a symbol in language LANG, using demangling args ARG_MODE, and print it filtered to STREAM. If the name is not mangled, or the language for the name is unknown, or - demangling is off, the name is printed in its "raw" form. */ + demangling is off, the name is printed in its "raw" form. */ void -fprintf_symbol_filtered (struct ui_file *stream, char *name, +fprintf_symbol_filtered (struct ui_file *stream, const char *name, enum language lang, int arg_mode) { char *demangled; @@ -2581,7 +2510,7 @@ fprintf_symbol_filtered (struct ui_file *stream, char *name, As an extra hack, string1=="FOO(ARGS)" matches string2=="FOO". This "feature" is useful when searching for matching C++ function names (such as if the user types 'break FOO', where FOO is a mangled C++ - function). */ + function). */ int strcmp_iw (const char *string1, const char *string2) @@ -2596,10 +2525,12 @@ strcmp_iw (const char *string1, const char *string2) { string2++; } - if (*string1 != *string2) - { - break; - } + if (case_sensitivity == case_sensitive_on && *string1 != *string2) + break; + if (case_sensitivity == case_sensitive_off + && (tolower ((unsigned char) *string1) + != tolower ((unsigned char) *string2))) + break; if (*string1 != '\0') { string1++; @@ -2620,6 +2551,10 @@ strcmp_iw (const char *string1, const char *string2) strcmp_iw(LIST_ELT, NAME), then the place to start looking is right where this function would put NAME. + This function must be neutral to the CASE_SENSITIVITY setting as the user + may choose it during later lookup. Therefore this function always sorts + primarily case-insensitively and secondarily case-sensitively. + Here are some examples of why using strcmp to sort is a bad idea: Whitespace example: @@ -2645,47 +2580,78 @@ strcmp_iw (const char *string1, const char *string2) int strcmp_iw_ordered (const char *string1, const char *string2) { - while ((*string1 != '\0') && (*string2 != '\0')) + const char *saved_string1 = string1, *saved_string2 = string2; + enum case_sensitivity case_pass = case_sensitive_off; + + for (;;) { - while (isspace (*string1)) - { - string1++; - } - while (isspace (*string2)) - { - string2++; - } - if (*string1 != *string2) + /* C1 and C2 are valid only if *string1 != '\0' && *string2 != '\0'. + Provide stub characters if we are already at the end of one of the + strings. */ + char c1 = 'X', c2 = 'X'; + + while (*string1 != '\0' && *string2 != '\0') { - break; + while (isspace (*string1)) + string1++; + while (isspace (*string2)) + string2++; + + switch (case_pass) + { + case case_sensitive_off: + c1 = tolower ((unsigned char) *string1); + c2 = tolower ((unsigned char) *string2); + break; + case case_sensitive_on: + c1 = *string1; + c2 = *string2; + break; + } + if (c1 != c2) + break; + + if (*string1 != '\0') + { + string1++; + string2++; + } } - if (*string1 != '\0') + + switch (*string1) { - string1++; - string2++; + /* Characters are non-equal unless they're both '\0'; we want to + make sure we get the comparison right according to our + comparison in the cases where one of them is '\0' or '('. */ + case '\0': + if (*string2 == '\0') + break; + else + return -1; + case '(': + if (*string2 == '\0') + return 1; + else + return -1; + default: + if (*string2 == '\0' || *string2 == '(') + return 1; + else if (c1 > c2) + return 1; + else if (c1 < c2) + return -1; + /* PASSTHRU */ } - } - switch (*string1) - { - /* Characters are non-equal unless they're both '\0'; we want to - make sure we get the comparison right according to our - comparison in the cases where one of them is '\0' or '('. */ - case '\0': - if (*string2 == '\0') + if (case_pass == case_sensitive_on) return 0; - else - return -1; - case '(': - if (*string2 == '\0') - return 1; - else - return -1; - default: - if (*string2 == '(') - return 1; - else - return *string1 - *string2; + + /* Otherwise the strings were equal in case insensitive way, make + a more fine grained comparison in a case sensitive way. */ + + case_pass = case_sensitive_on; + string1 = saved_string1; + string2 = saved_string2; } } @@ -2708,80 +2674,58 @@ int subset_compare (char *string_to_compare, char *template_string) { int match; + 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) { - fprintf_filtered (file, _("Timestamping debugging messages is %s.\n"), value); + fprintf_filtered (file, _("Timestamping debugging messages is %s.\n"), + value); } void initialize_utils (void) { - struct cmd_list_element *c; - 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 ("demangle", class_support, &demangle, _("\ -Set demangling of encoded C++/ObjC names when displaying symbols."), _("\ -Show demangling of encoded C++/ObjC names when displaying symbols."), NULL, - NULL, - show_demangle, - &setprintlist, &showprintlist); - 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."), _("\ @@ -2790,13 +2734,6 @@ Show printing of 8-bit characters in strings as \\nnn."), NULL, show_sevenbit_strings, &setprintlist, &showprintlist); - add_setshow_boolean_cmd ("asm-demangle", class_support, &asm_demangle, _("\ -Set demangling of C++/ObjC names in disassembly listings."), _("\ -Show demangling of C++/ObjC names in disassembly listings."), NULL, - NULL, - show_asm_demangle, - &setprintlist, &showprintlist); - add_setshow_boolean_cmd ("timestamp", class_maintenance, &debug_timestamp, _("\ Set timestamping of debugging messages."), _("\ @@ -2807,339 +2744,76 @@ When set, debugging messages will be marked with seconds and microseconds."), &setdebuglist, &showdebuglist); } -/* Machine specific function to handle SIGWINCH signal. */ - -#ifdef SIGWINCH_HANDLER_BODY -SIGWINCH_HANDLER_BODY -#endif -/* 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]; -} - -int -strlen_paddr (void) -{ - return (gdbarch_addr_bit (current_gdbarch) / 8 * 2); -} - -char * -paddr (CORE_ADDR addr) -{ - return phex (addr, gdbarch_addr_bit (current_gdbarch) / 8); -} - -char * -paddr_nz (CORE_ADDR addr) -{ - return phex_nz (addr, gdbarch_addr_bit (current_gdbarch) / 8); -} - const char * -paddress (CORE_ADDR addr) +paddress (struct gdbarch *gdbarch, CORE_ADDR addr) { /* Truncate address to the size of a target address, avoiding shifts larger or equal than the width of a CORE_ADDR. The local variable ADDR_BIT stops the compiler reporting a shift overflow - when it won't occur. */ + when it won't occur. */ /* NOTE: This assumes that the significant address information is kept in the least significant bits of ADDR - the upper bits were either zero or sign extended. Should gdbarch_address_to_pointer or some ADDRESS_TO_PRINTABLE() be used to do the conversion? */ - int addr_bit = gdbarch_addr_bit (current_gdbarch); + int addr_bit = gdbarch_addr_bit (gdbarch); if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT)) addr &= ((CORE_ADDR) 1 << addr_bit) - 1; return hex_string (addr); } -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; -} +/* This function is described in "defs.h". */ -static char * -octal2str (ULONGEST addr, int width) +const char * +print_core_address (struct gdbarch *gdbarch, CORE_ADDR address) { - unsigned long temp[3]; - char *str = get_cell (); + int addr_bit = gdbarch_addr_bit (gdbarch); - 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); -} + if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT)) + address &= ((CORE_ADDR) 1 << addr_bit) - 1; -char * -plongest (LONGEST l) -{ - if (l < 0) - return decimal2str ("-", -l, 0); + /* FIXME: cagney/2002-05-03: Need local_address_string() function + that returns the language localized string formatted to a width + based on gdbarch_addr_bit. */ + if (addr_bit <= 32) + return hex_string_custom (address, 8); else - return decimal2str ("", l, 0); + return hex_string_custom (address, 16); } -/* Eliminate warning from compiler on 32-bit systems. */ -static int thirty_two = 32; +/* Callback hash_f for htab_create_alloc or htab_create_alloc_ex. */ -char * -phex (ULONGEST l, int sizeof_l) +hashval_t +core_addr_hash (const void *ap) { - char *str; + const CORE_ADDR *addrp = ap; - 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; + return *addrp; } -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; - } +/* Callback eq_f for htab_create_alloc or htab_create_alloc_ex. */ - 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) +int +core_addr_eq (const void *ap, const void *bp) { - char *str = get_cell (); - strcpy (str, "0x"); - strcat (str, phex (addr, sizeof (addr))); - return str; -} + const CORE_ADDR *addr_ap = ap; + const CORE_ADDR *addr_bp = bp; -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; + return *addr_ap == *addr_bp; } /* Convert a string back into a CORE_ADDR. */ CORE_ADDR string_to_core_addr (const char *my_string) { - int addr_bit = gdbarch_addr_bit (current_gdbarch); CORE_ADDR addr = 0; if (my_string[0] == '0' && tolower (my_string[1]) == 'x') { /* Assume that it is in hex. */ int i; + for (i = 2; my_string[i] != '\0'; i++) { if (isdigit (my_string[i])) @@ -3149,22 +2823,12 @@ string_to_core_addr (const char *my_string) else error (_("invalid hex \"%s\""), my_string); } - - /* Not very modular, but if the executable format expects - addresses to be sign-extended, then do so if the address was - specified with only 32 significant bits. Really this should - be determined by the target architecture, not by the object - file. */ - if (i - 2 == addr_bit / 4 - && exec_bfd - && bfd_get_sign_extend_vma (exec_bfd)) - addr = (addr ^ ((CORE_ADDR) 1 << (addr_bit - 1))) - - ((CORE_ADDR) 1 << (addr_bit - 1)); } else { /* Assume that it is in decimal. */ int i; + for (i = 0; my_string[i] != '\0'; i++) { if (isdigit (my_string[i])) @@ -3177,80 +2841,50 @@ 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) +/* 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. */ + +#if defined (_WIN32) { -# 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 + 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); } -#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) +#else { 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 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); - return xstrdup (rp ? rp : filename); - } + if (rp != NULL) + return rp; } #endif @@ -3262,7 +2896,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; @@ -3270,14 +2904,14 @@ xfullpath (const char *filename) char *result; /* Extract the basename of filename, and return immediately - a copy of filename if it does not contain any directory prefix. */ + a copy of filename if it does not contain any directory prefix. */ if (base_name == filename) return xstrdup (filename); dir_name = 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 */ + then the closing \000 character. */ strncpy (dir_name, filename, base_name - filename); dir_name[base_name - filename] = '\000'; @@ -3292,87 +2926,42 @@ xfullpath (const char *filename) #endif /* Canonicalize the directory prefix, and build the resulting - filename. If the dirname realpath already contains an ending + filename. If the dirname realpath already contains an ending directory separator, avoid doubling it. */ real_path = gdb_realpath (dir_name); if (IS_DIR_SEPARATOR (real_path[strlen (real_path) - 1])) - result = concat (real_path, base_name, (char *)NULL); + result = concat (real_path, base_name, (char *) NULL); else - result = concat (real_path, SLASH_STRING, base_name, (char *)NULL); + result = concat (real_path, SLASH_STRING, base_name, (char *) NULL); xfree (real_path); 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'); + + if (path[0] == '~') + return tilde_expand (path); -/* 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 long 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 (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 @@ -3397,8 +2986,9 @@ 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); return ptr; } @@ -3550,11 +3140,346 @@ char ** gdb_buildargv (const char *s) { char **argv = buildargv (s); + if (s != NULL && argv == NULL) - nomem (0); + malloc_failure (0); return argv; } +int +compare_positive_ints (const void *ap, const void *bp) +{ + /* Because we know we're comparing two ints which are positive, + there's no danger of overflow here. */ + return * (int *) ap - * (int *) bp; +} + +/* String compare function for qsort. */ + +int +compare_strings (const void *arg1, const void *arg2) +{ + const char **s1 = (const char **) arg1; + const char **s2 = (const char **) arg2; + + return strcmp (*s1, *s2); +} + +#define AMBIGUOUS_MESS1 ".\nMatching formats:" +#define AMBIGUOUS_MESS2 \ + ".\nUse \"set gnutarget format-name\" to specify the format." + +const char * +gdb_bfd_errmsg (bfd_error_type error_tag, char **matching) +{ + char *ret, *retp; + int ret_len; + char **p; + + /* Check if errmsg just need simple return. */ + if (error_tag != bfd_error_file_ambiguously_recognized || matching == NULL) + return bfd_errmsg (error_tag); + + ret_len = strlen (bfd_errmsg (error_tag)) + strlen (AMBIGUOUS_MESS1) + + strlen (AMBIGUOUS_MESS2); + for (p = matching; *p; p++) + ret_len += strlen (*p) + 1; + ret = xmalloc (ret_len + 1); + retp = ret; + make_cleanup (xfree, ret); + + strcpy (retp, bfd_errmsg (error_tag)); + retp += strlen (retp); + + strcpy (retp, AMBIGUOUS_MESS1); + retp += strlen (retp); + + for (p = matching; *p; p++) + { + sprintf (retp, " %s", *p); + retp += strlen (retp); + } + xfree (matching); + + strcpy (retp, AMBIGUOUS_MESS2); + + return ret; +} + +/* Return ARGS parsed as a valid pid, or throw an error. */ + +int +parse_pid_to_attach (const char *args) +{ + unsigned long pid; + char *dummy; + + if (!args) + error_no_arg (_("process-id to attach")); + + 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)]) + error (_("Illegal process-id: %s."), args); + + return pid; +} + +/* Helper for make_bpstat_clear_actions_cleanup. */ + +static void +do_bpstat_clear_actions_cleanup (void *unused) +{ + bpstat_clear_actions (); +} + +/* Call bpstat_clear_actions for the case an exception is throw. You should + discard_cleanups if no exception is caught. */ + +struct cleanup * +make_bpstat_clear_actions_cleanup (void) +{ + return make_cleanup (do_bpstat_clear_actions_cleanup, NULL); +} + +/* Check for GCC >= 4.x according to the symtab->producer string. Return minor + version (x) of 4.x in such case. If it is not GCC or it is GCC older than + 4.x return -1. If it is GCC 5.x or higher return INT_MAX. */ + +int +producer_is_gcc_ge_4 (const char *producer) +{ + int major, minor; + + if (! producer_is_gcc (producer, &major, &minor)) + return -1; + if (major < 4) + return -1; + if (major > 4) + return INT_MAX; + return minor; +} + +/* 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. */ + +int +producer_is_gcc (const char *producer, int *major, int *minor) +{ + const char *cs; + + if (producer != NULL && startswith (producer, "GNU ")) + { + int maj, min; + + if (major == NULL) + major = &maj; + if (minor == NULL) + minor = &min; + + /* 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; + } + + /* Not recognized as GCC. */ + return 0; +} + +/* Helper for make_cleanup_free_char_ptr_vec. */ + +static void +do_free_char_ptr_vec (void *arg) +{ + VEC (char_ptr) *char_ptr_vec = arg; + + free_char_ptr_vec (char_ptr_vec); +} + +/* Make cleanup handler calling xfree for each element of CHAR_PTR_VEC and + final VEC_free for CHAR_PTR_VEC itself. + + You must not modify CHAR_PTR_VEC after this cleanup registration as the + CHAR_PTR_VEC base address may change on its updates. Contrary to VEC_free + this function does not (cannot) clear the pointer. */ + +struct cleanup * +make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec) +{ + return make_cleanup (do_free_char_ptr_vec, char_ptr_vec); +} + +/* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP + must come from xrealloc-compatible allocator and it may be updated. FROM + needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be + located at the start or end of *STRINGP. */ + +void +substitute_path_component (char **stringp, const char *from, const char *to) +{ + char *string = *stringp, *s; + const size_t from_len = strlen (from); + const size_t to_len = strlen (to); + + for (s = string;;) + { + s = strstr (s, from); + if (s == NULL) + break; + + if ((s == string || IS_DIR_SEPARATOR (s[-1]) + || s[-1] == DIRNAME_SEPARATOR) + && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len]) + || s[from_len] == DIRNAME_SEPARATOR)) + { + char *string_new; + + string_new = xrealloc (string, (strlen (string) + to_len + 1)); + + /* Relocate the current S pointer. */ + s = s - string + string_new; + string = string_new; + + /* Replace from by to. */ + memmove (&s[to_len], &s[from_len], strlen (&s[from_len]) + 1); + memcpy (s, to, to_len); + + s += to_len; + } + else + s++; + } + + *stringp = string; +} + +#ifdef HAVE_WAITPID + +#ifdef SIGALRM + +/* SIGALRM handler for waitpid_with_timeout. */ + +static void +sigalrm_handler (int signo) +{ + /* Nothing to do. */ +} + +#endif + +/* Wrapper to wait for child PID to die with TIMEOUT. + TIMEOUT is the time to stop waiting in seconds. + If TIMEOUT is zero, pass WNOHANG to waitpid. + Returns PID if it was successfully waited for, otherwise -1. + + Timeouts are currently implemented with alarm and SIGALRM. + If the host does not support them, this waits "forever". + It would be odd though for a host to have waitpid and not SIGALRM. */ + +pid_t +wait_to_die_with_timeout (pid_t pid, int *status, int timeout) +{ + pid_t waitpid_result; + + gdb_assert (pid > 0); + gdb_assert (timeout >= 0); + + if (timeout > 0) + { +#ifdef SIGALRM +#if defined (HAVE_SIGACTION) && defined (SA_RESTART) + struct sigaction sa, old_sa; + + sa.sa_handler = sigalrm_handler; + sigemptyset (&sa.sa_mask); + sa.sa_flags = 0; + sigaction (SIGALRM, &sa, &old_sa); +#else + void (*ofunc) (); + + ofunc = (void (*)()) signal (SIGALRM, sigalrm_handler); +#endif + + alarm (timeout); +#endif + + waitpid_result = waitpid (pid, status, 0); + +#ifdef SIGALRM + alarm (0); +#if defined (HAVE_SIGACTION) && defined (SA_RESTART) + sigaction (SIGALRM, &old_sa, NULL); +#else + signal (SIGALRM, ofunc); +#endif +#endif + } + else + waitpid_result = waitpid (pid, status, WNOHANG); + + if (waitpid_result == pid) + return pid; + else + return -1; +} + +#endif /* HAVE_WAITPID */ + +/* Provide fnmatch compatible function for FNM_FILE_NAME matching of host files. + Both FNM_FILE_NAME and FNM_NOESCAPE must be set in FLAGS. + + It handles correctly HAVE_DOS_BASED_FILE_SYSTEM and + HAVE_CASE_INSENSITIVE_FILE_SYSTEM. */ + +int +gdb_filename_fnmatch (const char *pattern, const char *string, int flags) +{ + gdb_assert ((flags & FNM_FILE_NAME) != 0); + + /* It is unclear how '\' escaping vs. directory separator should coexist. */ + gdb_assert ((flags & FNM_NOESCAPE) != 0); + +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + char *pattern_slash, *string_slash; + + /* Replace '\' by '/' in both strings. */ + + pattern_slash = 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); + strcpy (string_slash, string); + string = string_slash; + for (; *string_slash != 0; string_slash++) + if (IS_DIR_SEPARATOR (*string_slash)) + *string_slash = '/'; + } +#endif /* HAVE_DOS_BASED_FILE_SYSTEM */ + +#ifdef HAVE_CASE_INSENSITIVE_FILE_SYSTEM + flags |= FNM_CASEFOLD; +#endif /* HAVE_CASE_INSENSITIVE_FILE_SYSTEM */ + + return fnmatch (pattern, string, flags); +} + /* Provide a prototype to silence -Wmissing-prototypes. */ extern initialize_file_ftype _initialize_utils; @@ -3563,4 +3488,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); }