1999-04-16 09:35:26 +08:00
|
|
|
|
/* General utility routines for GDB, the GNU debugger.
|
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* ax-gdb.c, c-valprint.c, charset.c, corefile.c: Update copyright.
* demangle.c, disasm.c, dwarf2cfi.c, dwarfread.c: Update copyright.
* elfread.c, eval.c, expprint.c, expression.h: Update copyright.
* f-typeprint.c, findvar.c, gcore.c, gdb_mbuild.sh: Update copyright.
* gdbtypes.h, gnu-v2-abi.c, inferior.h, inftarg.c: Update copyright.
* language.c, language.h, m32r-tdep.c: Update copyright.
* mn10200-tdep.c, scm-lang.c, scm-lang.h: Update copyright.
* somsolib.c, somsolib.h, symfile.c, symtab.h: Update copyright.
* thread-db.c, typeprint.c, utils.c, valarith.c: Update copyright.
* values.c, win32-nat.c, x86-64-linux-nat.c: Update copyright.
* x86-64-linux-tdep.c, z8k-tdep.c: Update copyright.
* cli/cli-decode.h, config/h8500/tm-h8500.h: Update copyright.
Index: mi/ChangeLog
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* mi-cmd-env.c: Update copyright.
2003-01-14 08:49:06 +08:00
|
|
|
|
|
2012-01-04 16:28:28 +08:00
|
|
|
|
Copyright (C) 1986, 1988-2012 Free Software Foundation, Inc.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-24 02:08:50 +08:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-08 04:19:36 +08:00
|
|
|
|
(at your option) any later version.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-24 02:08:50 +08:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-02-08 23:54:32 +08:00
|
|
|
|
#include "defs.h"
|
2011-10-10 06:21:43 +08:00
|
|
|
|
#include "dyn-string.h"
|
2002-02-08 23:54:32 +08:00
|
|
|
|
#include "gdb_assert.h"
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "gdb_string.h"
|
2011-12-15 04:53:57 +08:00
|
|
|
|
#include "gdb_wait.h"
|
2002-02-08 23:54:32 +08:00
|
|
|
|
#include "event-top.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-13 02:31:35 +08:00
|
|
|
|
#include "exceptions.h"
|
Remove global continuations in favour of a per-thread
continuations.
* gdbthread.h (struct thread_info): Add comments around
continuations and intermediate_continuations.
(save_infrun_state, load_infrun_state): Delete continuations and
intermediate_continuations arguments.
* infrun.c (fetch_inferior_event): Only call normal_stop if
stop_soon is NO_STOP_QUIETLY.
(context_switch): Don't context-switch the continuations.
* thread.c (clear_thread_inferior_resources): Discard all
continuations of the thread we're clearing.
(save_infrun_state, load_infrun_state): Delete continuations and
intermediate_continuations arguments, and the code referencing
them.
* utils.c: Include "gdbthread.h".
(cmd_continuation, intermediate_continuation): Delete.
(add_continuation): Add thread_info* argument. Install the
continuation on it.
(restore_thread_cleanup): New.
(do_all_continuations_ptid, do_all_continuations_thread_callback):
New.
(do_all_continuations): Reimplement.
(discard_all_continuations_thread_callback,
discard_all_continuations_thread): New.
(discard_all_continuations): Reimplement.
(add_intermediate_continuation): Add thread_info* argument.
Install the continuation on it.
(do_all_intermediate_continuations_thread_callback)
(do_all_intermediate_continuations_thread): New.
(do_all_intermediate_continuations): Reimplement.
(discard_all_intermediate_continuations_thread_callback): New.
(discard_all_intermediate_continuations_thread): New.
(discard_all_intermediate_continuations): Reimplement.
* breakpoint.c (until_break_command): Install the continuation on
the current thread.
* defs.h (cmd_continuation, intermediate_continuation): Delete.
(struct thread_info): Forward declare.
(add_continuation, add_intermediate_continuation): Add
thread_info* argument.
(do_all_continuations_thread, discard_all_continuations_thread)
(do_all_intermediate_continuations_thread)
(discard_all_intermediate_continuations_thread): Declare.
* inf-loop.c (inferior_event_handler): In non-stop only run
continuations on the thread that stopped. In all-stop, run
continuations on all threads.
* infcmd.c (step_once, finish_command): Adjust.
2008-09-09 05:57:42 +08:00
|
|
|
|
#include "gdbthread.h"
|
2012-07-02 18:57:34 +08:00
|
|
|
|
#include "fnmatch.h"
|
* dwarf2read.c (try_open_dwo_file): Use gdb_bfd_ref and
gdb_bfd_unref.
(free_dwo_file): Use gdb_bfd_unref.
* cli/cli-dump.c: Include gdb_bfd.h.
(bfd_openw_with_cleanup): Use gdb_bfd_ref.
(bfd_openr_with_cleanup): Likewise.
* windows-nat.c (windows_make_so): Use gdb_bfd_ref,
gdb_bfd_unref.
* utils.c: Include gdb_bfd.h.
(do_bfd_close_cleanup): Use gdb_bfd_unref.
* symfile.c: Include gdb_bfd.h.
(separate_debug_file_exists): Use gdb_bfd_unref.
(bfd_open_maybe_remote): Use gdb_bfd_ref.
(symfile_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
(generic_load): Use gdb_bfd_ref.
(reread_symbols): Use gdb_bfd_unref.
* symfile-mem.c: Include gdb_bfd.h.
(symbol_file_add_from_memory): Use make_cleanup_bfd_close.
* spu-linux-nat.c (spu_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
* solib.c: Include gdb_bfd.h.
(solib_bfd_fopen): Use gdb_bfd_ref.
(solib_bfd_open): Use gdb_bfd_unref.
(free_so_symbols): Use gdb_bfd_unref.
(reload_shared_libraries_1): Use gdb_bfd_unref.
* solib-spu.c: Include gdb_bfd.h.
(spu_bfd_fopen): Use gdb_bfd_ref, gdb_bfd_unref.
* solib-pa64.c (pa64_solib_create_inferior_hook): Use gdb_bfd_ref,
gdb_bfd_unref.
* solib-frv.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-dsbt.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-darwin.c: Include gdb_bfd.h.
(darwin_solib_get_all_image_info_addr_at_init): Use gdb_bfd_ref,
gdb_bfd_unref.
(darwin_bfd_open): Use gdb_bfd_unref.
* rs6000-nat.c (add_vmap): Use gdb_bfd_ref, gdb_bfd_unref.
* remote-mips.c: Include gdb_bfd.h.
(mips_load_srec): Use gdb_bfd_ref.
(pmon_load_fast): Use gdb_bfd_ref.
* remote-m32r-sdi.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
* record.c: Include gdb_bfd.h.
(record_save_cleanups): Use gdb_bfd_unref.
(cmd_record_save): Use gdb_bfd_unref.
* procfs.c (insert_dbx_link_bpt_in_file): Use gdb_bfd_ref,
gdb_bfd_unref.
* objfiles.h (gdb_bfd_close_or_warn): Remove.
(gdb_bfd_ref, gdb_bfd_unref): Move to gdb_bfd.h.
* objfiles.c: Include gdb_bfd.h.
(free_objfile): Use gdb_bfd_unref.
(gdb_bfd_close_or_warn, gdb_bfd_ref, gdb_bfd_unref): Move to
gdb_bfd.c.
* machoread.c (macho_add_oso_symfile): Use gdb_bfd_unref.
(macho_symfile_read_all_oso): Use gdb_bfd_ref, gdb_bfd_unref.
(macho_check_dsym): Likewise.
* m32r-rom.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
(m32r_upload_command): Use gdb_bfd_ref.
* jit.c: Include gdb_bfd.h.
(jit_bfd_try_read_symtab): Use gdb_bfd_ref, gdb_bfd_unref.
* gdb_bfd.h: New file.
* gdb_bfd.c: New file.
* gcore.c: Include gdb_bfd.h.
(create_gcore_bfd): Use gdb_bfd_ref.
(do_bfd_delete_cleanup): Use gdb_bfd_unref.
(gcore_command): Use gdb_bfd_unref.
* exec.c: Include gdb_bfd.h.
(exec_close): Use gdb_bfd_unref.
(exec_close_1): Use gdb_bfd_unref.
(exec_file_attach): Use gdb_bfd_ref.
* elfread.c: Include gdb_bfd.h.
(build_id_verify): Use gdb_bfd_unref.
* dsrec.c: Include gdb_bfd.h.
(load_srec): Use gdb_bfd_ref.
* corelow.c: Include gdb_bfd.h.
(core_close): Use gdb_bfd_unref.
(core_open): Use gdb_bfd_ref.
* bfd-target.c: Include gdb_bfd.h.
(target_bfd_xclose): Use gdb_bfd_unref.
(target_bfd_reopen): Use gdb_bfd_ref.
* Makefile.in (SFILES): Add gdb_bfd.c.
(HFILES_NO_SRCDIR): Add gdb_bfd.h.
(COMMON_OBS): Add gdb_bfd.o.
2012-07-19 03:33:34 +08:00
|
|
|
|
#include "gdb_bfd.h"
|
2010-01-15 08:34:37 +08:00
|
|
|
|
#ifdef HAVE_SYS_RESOURCE_H
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
#endif /* HAVE_SYS_RESOURCE_H */
|
2002-02-08 23:54:32 +08:00
|
|
|
|
|
2004-02-10 Andrew Cagney <cagney@redhat.com>
* defs.h: Do not include "tui.h".
* gdb_curses.h: New file.
* tui/tui-hooks.h: New file.
* tui/tui.h (tui_update_all_exec_infos): Delete declaration.
(tui_install_hooks, tui_remove_hooks): Delete declarations.
(tui_initialize_io): Delete declaration.
(tui_initialize_readline: Delete redundant declaration.
(struct tui_point): Delete definition.
* tui/tui-data.h (struct tui_point): Define.
* cli/cli-decode.c [TUI]: Include "tui/tui.h".
* utils.c: Include "tui/tui.h".
* tui/tui-data.h: Include "tui/tui.h" and "gdb_curses.h".
* printcmd.c [TUI]: Include "tui/tui.h".
* cli/cli-cmds.c [TUI]: Include "tui/tui.h".
* tui/tui-command.c: Include "gdb_curses.h".
* tui/tui.c, tui/tui-winsource.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-windata.c, tui/tui-win.c, tui/tui-stack.c: Ditto.
* tui/tui-source.c, tui/tui-regs.c, tui/tui-layout.c: Ditto.
* tui/tui-io.c, tui/tui-disasm.c, tui/tui-data.c: : Ditto.
* tui/tui-hooks.c: Include "tui-hooks.h" and "gdb_curses.h".
* Makefile.in: Update all dependencies.
(tui_hooks_h, gdb_curses_h): Define.
(SUBDIR_TUI_CFLAGS): Remove -I${srcdir}/tui.
2004-02-11 03:08:19 +08:00
|
|
|
|
#ifdef TUI
|
|
|
|
|
#include "tui/tui.h" /* For tui_get_command_dimension. */
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-02-29 15:45:13 +08:00
|
|
|
|
#ifdef __GO32__
|
|
|
|
|
#include <pc.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* SunOS's curses.h has a '#define reg register' in it. Thank you Sun. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#ifdef reg
|
|
|
|
|
#undef reg
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-02-06 12:17:03 +08:00
|
|
|
|
#include <signal.h>
|
2011-11-05 00:45:13 +08:00
|
|
|
|
#include "timeval-utils.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "serial.h"
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "target.h"
|
2011-11-11 04:21:29 +08:00
|
|
|
|
#include "gdb-demangle.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "language.h"
|
2002-09-20 08:24:01 +08:00
|
|
|
|
#include "charset.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "annotate.h"
|
2002-04-06 00:39:11 +08:00
|
|
|
|
#include "filenames.h"
|
2004-09-09 05:58:19 +08:00
|
|
|
|
#include "symfile.h"
|
gdb/
* Makefile.in (gdbtypes_h, gdbtypes.o, utils.o): Update.
* defs.h (hashtab_obstack_allocate, dummy_obstack_deallocate): Add
prototypes.
* dwarf2read.c (read_subroutine_type): Use TYPE_ZALLOC.
(hashtab_obstack_allocate, dummy_obstack_deallocate): Moved to...
* utils.c (hashtab_obstack_allocate, dummy_obstack_deallocate):
...here.
* gdbtypes.c: Include "hashtab.h".
(build_gdbtypes): Remove extra prototype.
(struct type_pair, type_pair_hash, type_pair_eq)
(create_copied_types_hash, copy_type_recursive): New.
* gdbtypes.h: Include "hashtab.h".
(TYPE_ZALLOC): New.
(create_copied_types_hash, copy_type_recursive): New prototypes.
* objfiles.c (free_objfile): Call preserve_values.
* symfile.c (reread_symbols): Likewise.
(clear_symtab_users): Remove calls to clear_value_history and
clear_internalvars.
* value.c (clear_value_history, clear_internalvars): Removed.
(preserve_one_value, preserve_values): New functions.
* value.h (clear_value_history, clear_internalvars): Removed.
(preserve_values): New prototype.
* tracepoint.c (_initialize_tracepoint): Do not initialize convenience
variables here.
gdb/doc/
* gdb.texinfo (Files): Remove obsolete bits from the description
of "symbol-file".
2006-02-02 07:14:11 +08:00
|
|
|
|
#include "gdb_obstack.h"
|
2007-12-18 01:49:29 +08:00
|
|
|
|
#include "gdbcore.h"
|
2006-03-30 06:53:33 +08:00
|
|
|
|
#include "top.h"
|
2010-03-09 03:20:38 +08:00
|
|
|
|
#include "main.h"
|
2011-10-14 15:55:26 +08:00
|
|
|
|
#include "solist.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2003-02-01 06:45:22 +08:00
|
|
|
|
#include "inferior.h" /* for signed_pointer_to_address */
|
2000-06-04 21:46:37 +08:00
|
|
|
|
|
2002-01-20 08:44:47 +08:00
|
|
|
|
#include <sys/param.h> /* For MAXPATHLEN */
|
|
|
|
|
|
2004-11-09 08:59:03 +08:00
|
|
|
|
#include "gdb_curses.h"
|
2002-12-01 00:33:55 +08:00
|
|
|
|
|
2004-02-28 Andrew Cagney <cagney@redhat.com>
* utils.c: Use "", instead of <>, to include readline.
tui/tui-win.c, tui/tui.c, tui/tui-hooks.c: Ditto.
* tracepoint.c, top.c, symmisc.c, symfile.c: Ditto.
* source.c, solib.c, exec.c, event-top.c: Ditto.
* corelow.c, completer.c, cli/cli-setshow.c: Ditto.
* cli/cli-dump.c, cli/cli-cmds.c: Ditto.
* Makefile.in: Update all dependencies.
(readline_tilde_h, readline_history_h): Define.
(readline_headers): Delete.
2004-02-29 02:04:37 +08:00
|
|
|
|
#include "readline/readline.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-02-28 04:50:49 +08:00
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
2009-05-07 06:54:58 +08:00
|
|
|
|
#include "gdb_usleep.h"
|
2010-03-04 09:06:28 +08:00
|
|
|
|
#include "interps.h"
|
2011-01-18 00:50:42 +08:00
|
|
|
|
#include "gdb_regex.h"
|
2009-05-07 06:54:58 +08:00
|
|
|
|
|
2005-01-21 21:14:02 +08:00
|
|
|
|
#if !HAVE_DECL_MALLOC
|
2009-04-25 06:10:03 +08:00
|
|
|
|
extern PTR malloc (); /* ARI: PTR */
|
2001-03-20 09:37:10 +08:00
|
|
|
|
#endif
|
2005-01-21 21:14:02 +08:00
|
|
|
|
#if !HAVE_DECL_REALLOC
|
2009-04-25 06:10:03 +08:00
|
|
|
|
extern PTR realloc (); /* ARI: PTR */
|
2001-03-20 08:54:43 +08:00
|
|
|
|
#endif
|
2005-01-21 21:14:02 +08:00
|
|
|
|
#if !HAVE_DECL_FREE
|
2001-03-20 08:28:23 +08:00
|
|
|
|
extern void free ();
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* readline defines this. */
|
|
|
|
|
#undef savestring
|
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
void (*deprecated_error_begin_hook) (void);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
|
2000-02-02 08:21:19 +08:00
|
|
|
|
static void vfprintf_maybe_filtered (struct ui_file *, const char *,
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-03 05:14:59 +08:00
|
|
|
|
va_list, int) ATTRIBUTE_PRINTF (2, 0);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-02-02 08:21:19 +08:00
|
|
|
|
static void fputs_maybe_filtered (const char *, struct ui_file *, int);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-05-28 09:12:42 +08:00
|
|
|
|
static void prompt_for_continue (void);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
static void set_screen_size (void);
|
2000-05-28 09:12:42 +08:00
|
|
|
|
static void set_width (void);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* 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 struct timeval prompt_for_continue_wait_time;
|
|
|
|
|
|
2008-02-28 04:50:49 +08:00
|
|
|
|
/* A flag indicating whether to timestamp debugging messages. */
|
|
|
|
|
|
|
|
|
|
static int debug_timestamp = 0;
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Nonzero if we have job control. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
about being able to deal with being interrupted at any time. It is
|
|
|
|
|
almost always better to use QUIT; the only exception I can think of
|
|
|
|
|
is being able to quit out of a system call (using EINTR loses if
|
|
|
|
|
the SIGINT happens between the previous QUIT and the system call).
|
|
|
|
|
To immediately quit in the case in which a SIGINT happens between
|
|
|
|
|
the previous QUIT and setting immediate_quit (desirable anytime we
|
|
|
|
|
expect to block), call QUIT after setting immediate_quit. */
|
|
|
|
|
|
|
|
|
|
int immediate_quit;
|
|
|
|
|
|
|
|
|
|
/* 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.) */
|
|
|
|
|
|
|
|
|
|
int sevenbit_strings = 0;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_sevenbit_strings (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
2011-01-06 06:22:53 +08:00
|
|
|
|
fprintf_filtered (file, _("Printing of 8-bit characters "
|
|
|
|
|
"in strings as \\nnn is %s.\n"),
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
value);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* 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: ";
|
|
|
|
|
|
|
|
|
|
int pagination_enabled = 1;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_pagination_enabled (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("State of pagination is %s.\n"), value);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
* cleanups.h: New file.
* cleanups.c: New file.
* Makefile.in (SFILES): Add cleanups.c.
(HFILES_NO_SRCDIR): Add cleanups.h.
(COMMON_OBS): Add cleanups.o.
* defs.h (struct cleanup): Moved to cleanups.h.
(do_cleanups,do_final_cleanups): Ditto.
(discard_cleanups,discard_final_cleanups): Ditto
(make_cleanup,make_cleanup_dtor,make_final_cleanup): Ditto.
(save_cleanups,save_final_cleanups): Ditto.
(restore_cleanups,restore_final_cleanups): Ditto.
(null_cleanup): Ditto.
(make_my_cleanup,make_my_cleanup2): Ditto.
(discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto.
* utils.c (cleanup_chain,final_cleanup_chain): Moved to cleanups.c.
(do_cleanups,do_final_cleanups): Ditto.
(discard_cleanups,discard_final_cleanups): Ditto
(make_cleanup,make_cleanup_dtor,make_final_cleanup): Ditto.
(save_cleanups,save_final_cleanups): Ditto.
(restore_cleanups,restore_final_cleanups): Ditto.
(null_cleanup): Ditto.
(make_my_cleanup,make_my_cleanup2): Ditto.
(discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto.
2012-04-18 05:13:20 +08:00
|
|
|
|
/* Cleanup utilities.
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
* cleanups.h: New file.
* cleanups.c: New file.
* Makefile.in (SFILES): Add cleanups.c.
(HFILES_NO_SRCDIR): Add cleanups.h.
(COMMON_OBS): Add cleanups.o.
* defs.h (struct cleanup): Moved to cleanups.h.
(do_cleanups,do_final_cleanups): Ditto.
(discard_cleanups,discard_final_cleanups): Ditto
(make_cleanup,make_cleanup_dtor,make_final_cleanup): Ditto.
(save_cleanups,save_final_cleanups): Ditto.
(restore_cleanups,restore_final_cleanups): Ditto.
(null_cleanup): Ditto.
(make_my_cleanup,make_my_cleanup2): Ditto.
(discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto.
* utils.c (cleanup_chain,final_cleanup_chain): Moved to cleanups.c.
(do_cleanups,do_final_cleanups): Ditto.
(discard_cleanups,discard_final_cleanups): Ditto
(make_cleanup,make_cleanup_dtor,make_final_cleanup): Ditto.
(save_cleanups,save_final_cleanups): Ditto.
(restore_cleanups,restore_final_cleanups): Ditto.
(null_cleanup): Ditto.
(make_my_cleanup,make_my_cleanup2): Ditto.
(discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto.
2012-04-18 05:13:20 +08:00
|
|
|
|
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". */
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
do_freeargv (void *arg)
|
1999-04-27 02:34:20 +08:00
|
|
|
|
{
|
1999-07-08 04:19:36 +08:00
|
|
|
|
freeargv ((char **) arg);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
2000-07-30 09:48:28 +08:00
|
|
|
|
make_cleanup_freeargv (char **arg)
|
1999-04-27 02:34:20 +08:00
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_freeargv, arg);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-10 06:21:43 +08:00
|
|
|
|
static void
|
|
|
|
|
do_dyn_string_delete (void *arg)
|
|
|
|
|
{
|
|
|
|
|
dyn_string_delete ((dyn_string_t) arg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_dyn_string_delete (dyn_string_t arg)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_dyn_string_delete, arg);
|
2011-10-10 06:21:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
2000-05-16 10:43:39 +08:00
|
|
|
|
static void
|
|
|
|
|
do_bfd_close_cleanup (void *arg)
|
|
|
|
|
{
|
* dwarf2read.c (try_open_dwo_file): Use gdb_bfd_ref and
gdb_bfd_unref.
(free_dwo_file): Use gdb_bfd_unref.
* cli/cli-dump.c: Include gdb_bfd.h.
(bfd_openw_with_cleanup): Use gdb_bfd_ref.
(bfd_openr_with_cleanup): Likewise.
* windows-nat.c (windows_make_so): Use gdb_bfd_ref,
gdb_bfd_unref.
* utils.c: Include gdb_bfd.h.
(do_bfd_close_cleanup): Use gdb_bfd_unref.
* symfile.c: Include gdb_bfd.h.
(separate_debug_file_exists): Use gdb_bfd_unref.
(bfd_open_maybe_remote): Use gdb_bfd_ref.
(symfile_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
(generic_load): Use gdb_bfd_ref.
(reread_symbols): Use gdb_bfd_unref.
* symfile-mem.c: Include gdb_bfd.h.
(symbol_file_add_from_memory): Use make_cleanup_bfd_close.
* spu-linux-nat.c (spu_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
* solib.c: Include gdb_bfd.h.
(solib_bfd_fopen): Use gdb_bfd_ref.
(solib_bfd_open): Use gdb_bfd_unref.
(free_so_symbols): Use gdb_bfd_unref.
(reload_shared_libraries_1): Use gdb_bfd_unref.
* solib-spu.c: Include gdb_bfd.h.
(spu_bfd_fopen): Use gdb_bfd_ref, gdb_bfd_unref.
* solib-pa64.c (pa64_solib_create_inferior_hook): Use gdb_bfd_ref,
gdb_bfd_unref.
* solib-frv.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-dsbt.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-darwin.c: Include gdb_bfd.h.
(darwin_solib_get_all_image_info_addr_at_init): Use gdb_bfd_ref,
gdb_bfd_unref.
(darwin_bfd_open): Use gdb_bfd_unref.
* rs6000-nat.c (add_vmap): Use gdb_bfd_ref, gdb_bfd_unref.
* remote-mips.c: Include gdb_bfd.h.
(mips_load_srec): Use gdb_bfd_ref.
(pmon_load_fast): Use gdb_bfd_ref.
* remote-m32r-sdi.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
* record.c: Include gdb_bfd.h.
(record_save_cleanups): Use gdb_bfd_unref.
(cmd_record_save): Use gdb_bfd_unref.
* procfs.c (insert_dbx_link_bpt_in_file): Use gdb_bfd_ref,
gdb_bfd_unref.
* objfiles.h (gdb_bfd_close_or_warn): Remove.
(gdb_bfd_ref, gdb_bfd_unref): Move to gdb_bfd.h.
* objfiles.c: Include gdb_bfd.h.
(free_objfile): Use gdb_bfd_unref.
(gdb_bfd_close_or_warn, gdb_bfd_ref, gdb_bfd_unref): Move to
gdb_bfd.c.
* machoread.c (macho_add_oso_symfile): Use gdb_bfd_unref.
(macho_symfile_read_all_oso): Use gdb_bfd_ref, gdb_bfd_unref.
(macho_check_dsym): Likewise.
* m32r-rom.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
(m32r_upload_command): Use gdb_bfd_ref.
* jit.c: Include gdb_bfd.h.
(jit_bfd_try_read_symtab): Use gdb_bfd_ref, gdb_bfd_unref.
* gdb_bfd.h: New file.
* gdb_bfd.c: New file.
* gcore.c: Include gdb_bfd.h.
(create_gcore_bfd): Use gdb_bfd_ref.
(do_bfd_delete_cleanup): Use gdb_bfd_unref.
(gcore_command): Use gdb_bfd_unref.
* exec.c: Include gdb_bfd.h.
(exec_close): Use gdb_bfd_unref.
(exec_close_1): Use gdb_bfd_unref.
(exec_file_attach): Use gdb_bfd_ref.
* elfread.c: Include gdb_bfd.h.
(build_id_verify): Use gdb_bfd_unref.
* dsrec.c: Include gdb_bfd.h.
(load_srec): Use gdb_bfd_ref.
* corelow.c: Include gdb_bfd.h.
(core_close): Use gdb_bfd_unref.
(core_open): Use gdb_bfd_ref.
* bfd-target.c: Include gdb_bfd.h.
(target_bfd_xclose): Use gdb_bfd_unref.
(target_bfd_reopen): Use gdb_bfd_ref.
* Makefile.in (SFILES): Add gdb_bfd.c.
(HFILES_NO_SRCDIR): Add gdb_bfd.h.
(COMMON_OBS): Add gdb_bfd.o.
2012-07-19 03:33:34 +08:00
|
|
|
|
gdb_bfd_unref (arg);
|
2000-05-16 10:43:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
2012-07-19 03:42:26 +08:00
|
|
|
|
make_cleanup_bfd_unref (bfd *abfd)
|
2000-05-16 10:43:39 +08:00
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_bfd_close_cleanup, abfd);
|
|
|
|
|
}
|
|
|
|
|
|
2000-05-23 22:48:13 +08:00
|
|
|
|
static void
|
|
|
|
|
do_close_cleanup (void *arg)
|
|
|
|
|
{
|
2001-02-07 11:44:24 +08:00
|
|
|
|
int *fd = arg;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2001-02-07 11:44:24 +08:00
|
|
|
|
close (*fd);
|
2000-05-23 22:48:13 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_close (int fd)
|
|
|
|
|
{
|
2001-02-07 11:44:24 +08:00
|
|
|
|
int *saved_fd = xmalloc (sizeof (fd));
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2001-02-07 11:44:24 +08:00
|
|
|
|
*saved_fd = fd;
|
2008-10-31 04:33:51 +08:00
|
|
|
|
return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree);
|
2000-05-23 22:48:13 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-10-28 23:22:13 +08:00
|
|
|
|
/* Helper function which does the work for make_cleanup_fclose. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_fclose_cleanup (void *arg)
|
|
|
|
|
{
|
2010-05-11 01:26:36 +08:00
|
|
|
|
FILE *file = arg;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2010-05-11 01:26:36 +08:00
|
|
|
|
fclose (file);
|
2008-10-28 23:22:13 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a new cleanup that closes FILE. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_fclose (FILE *file)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_fclose_cleanup, file);
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-20 01:39:31 +08:00
|
|
|
|
/* Helper function which does the work for make_cleanup_obstack_free. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_obstack_free (void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct obstack *ob = arg;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2009-03-20 01:39:31 +08:00
|
|
|
|
obstack_free (ob, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a new cleanup that frees OBSTACK. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_obstack_free (struct obstack *obstack)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_obstack_free, obstack);
|
|
|
|
|
}
|
|
|
|
|
|
1999-11-09 09:23:30 +08:00
|
|
|
|
static void
|
2000-02-02 08:21:19 +08:00
|
|
|
|
do_ui_file_delete (void *arg)
|
1999-11-09 09:23:30 +08:00
|
|
|
|
{
|
2000-02-02 08:21:19 +08:00
|
|
|
|
ui_file_delete (arg);
|
1999-11-09 09:23:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
2000-02-02 08:21:19 +08:00
|
|
|
|
make_cleanup_ui_file_delete (struct ui_file *arg)
|
1999-11-09 09:23:30 +08:00
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_ui_file_delete, arg);
|
1999-11-09 09:23:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
2010-09-12 00:00:27 +08:00
|
|
|
|
/* 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)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_ui_out_redirect_pop, uiout);
|
2010-09-12 00:00:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-09 05:58:19 +08:00
|
|
|
|
static void
|
|
|
|
|
do_free_section_addr_info (void *arg)
|
|
|
|
|
{
|
|
|
|
|
free_section_addr_info (arg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_free_section_addr_info (struct section_addr_info *addrs)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_free_section_addr_info, addrs);
|
2004-09-09 05:58:19 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-06-10 17:29:15 +08:00
|
|
|
|
struct restore_integer_closure
|
|
|
|
|
{
|
|
|
|
|
int *variable;
|
|
|
|
|
int value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
restore_integer (void *p)
|
|
|
|
|
{
|
|
|
|
|
struct restore_integer_closure *closure = p;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2008-06-10 17:29:15 +08:00
|
|
|
|
*(closure->variable) = closure->value;
|
|
|
|
|
}
|
2004-09-09 05:58:19 +08:00
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
/* Remember the current value of *VARIABLE and make it restored when
|
|
|
|
|
the cleanup is run. */
|
2010-08-07 23:00:39 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
struct cleanup *
|
2008-06-10 17:29:15 +08:00
|
|
|
|
make_cleanup_restore_integer (int *variable)
|
|
|
|
|
{
|
|
|
|
|
struct restore_integer_closure *c =
|
|
|
|
|
xmalloc (sizeof (struct restore_integer_closure));
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2008-06-10 17:29:15 +08:00
|
|
|
|
c->variable = variable;
|
|
|
|
|
c->value = *variable;
|
|
|
|
|
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup_dtor (restore_integer, (void *) c, xfree);
|
2008-06-10 17:29:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
/* Remember the current value of *VARIABLE and make it restored when
|
|
|
|
|
the cleanup is run. */
|
2010-08-07 23:00:39 +08:00
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_restore_uinteger (unsigned int *variable)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup_restore_integer ((int *) variable);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-20 01:51:25 +08:00
|
|
|
|
/* Helper for make_cleanup_unpush_target. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_unpush_target (void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct target_ops *ops = arg;
|
|
|
|
|
|
|
|
|
|
unpush_target (ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a new cleanup that unpushes OPS. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_unpush_target (struct target_ops *ops)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_unpush_target, ops);
|
2010-07-20 01:51:25 +08:00
|
|
|
|
}
|
|
|
|
|
|
gdb/
Implement basic support for DW_TAG_GNU_call_site.
* block.c: Include gdbtypes.h and exceptions.h.
(call_site_for_pc): New function.
* block.h (call_site_for_pc): New declaration.
* defs.h: Include hashtab.h.
(make_cleanup_htab_delete, core_addr_hash, core_addr_eq): New
declarations.
* dwarf2-frame.c (dwarf2_frame_ctx_funcs): Install
ctx_no_push_dwarf_reg_entry_value.
* dwarf2expr.c (read_uleb128, read_sleb128): Support R as NULL.
(dwarf_block_to_dwarf_reg): New function.
(execute_stack_op) <DW_OP_GNU_entry_value>: Implement it.
(ctx_no_push_dwarf_reg_entry_value): New function.
* dwarf2expr.h (struct dwarf_expr_context_funcs): New field
push_dwarf_reg_entry_value.
(ctx_no_push_dwarf_reg_entry_value, dwarf_block_to_dwarf_reg): New
declarations.
* dwarf2loc.c: Include gdbcmd.h.
(dwarf_expr_ctx_funcs): New forward declaration.
(entry_values_debug, show_entry_values_debug, call_site_to_target_addr)
(dwarf_expr_reg_to_entry_parameter)
(dwarf_expr_push_dwarf_reg_entry_value): New.
(dwarf_expr_ctx_funcs): Install dwarf_expr_push_dwarf_reg_entry_value.
(dwarf2_evaluate_loc_desc_full): Handle NO_ENTRY_VALUE_ERROR.
(needs_dwarf_reg_entry_value): New function.
(needs_frame_ctx_funcs): Install it.
(_initialize_dwarf2loc): New function.
* dwarf2loc.h (entry_values_debug): New declaration.
* dwarf2read.c (struct dwarf2_cu): New field call_site_htab.
(read_call_site_scope): New forward declaration.
(process_full_comp_unit): Copy call_site_htab.
(process_die): Support DW_TAG_GNU_call_site.
(read_call_site_scope): New function.
(dwarf2_get_pc_bounds): Support NULL HIGHPC.
(dwarf_tag_name): Support DW_TAG_GNU_call_site.
(cleanup_htab): Delete.
(write_psymtabs_to_index): Use make_cleanup_htab_delete instead of it.
* exceptions.h (enum errors): New NO_ENTRY_VALUE_ERROR.
* gdb-gdb.py (StructMainTypePrettyPrinter): Support
FIELD_LOC_KIND_DWARF_BLOCK.
* gdbtypes.h (enum field_loc_kind): New entry
FIELD_LOC_KIND_DWARF_BLOCK.
(struct main_type): New loc entry dwarf_block.
(struct call_site, FIELD_DWARF_BLOCK, SET_FIELD_DWARF_BLOCK)
(TYPE_FIELD_DWARF_BLOCK): New.
* python/py-type.c: Include dwarf2loc.h.
(check_types_equal): Support FIELD_LOC_KIND_DWARF_BLOCK. New
internal_error call on unknown FIELD_LOC_KIND.
* symtab.h (struct symtab): New field call_site_htab.
* utils.c (do_htab_delete_cleanup, make_cleanup_htab_delete)
(core_addr_hash, core_addr_eq): New functions.
gdb/testsuite/
Implement basic support for DW_TAG_GNU_call_site.
* gdb.arch/Makefile.in (EXECUTABLES): Add amd64-entry-value.
* gdb.arch/amd64-entry-value.cc: New file.
* gdb.arch/amd64-entry-value.exp: New file.
2011-10-10 03:21:39 +08:00
|
|
|
|
/* Helper for make_cleanup_htab_delete compile time checking the types. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_htab_delete_cleanup (void *htab_voidp)
|
|
|
|
|
{
|
|
|
|
|
htab_t htab = htab_voidp;
|
|
|
|
|
|
|
|
|
|
htab_delete (htab);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a new cleanup that deletes HTAB. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_htab_delete (htab_t htab)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_htab_delete_cleanup, htab);
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-07 23:00:39 +08:00
|
|
|
|
struct restore_ui_file_closure
|
|
|
|
|
{
|
|
|
|
|
struct ui_file **variable;
|
|
|
|
|
struct ui_file *value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_restore_ui_file (void *p)
|
|
|
|
|
{
|
|
|
|
|
struct restore_ui_file_closure *closure = p;
|
|
|
|
|
|
|
|
|
|
*(closure->variable) = closure->value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remember the current value of *VARIABLE and make it restored when
|
|
|
|
|
the cleanup is run. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_restore_ui_file (struct ui_file **variable)
|
|
|
|
|
{
|
|
|
|
|
struct restore_ui_file_closure *c = XNEW (struct restore_ui_file_closure);
|
|
|
|
|
|
|
|
|
|
c->variable = variable;
|
|
|
|
|
c->value = *variable;
|
|
|
|
|
|
|
|
|
|
return make_cleanup_dtor (do_restore_ui_file, (void *) c, xfree);
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-13 12:34:25 +08:00
|
|
|
|
/* Helper for make_cleanup_value_free_to_mark. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_value_free_to_mark (void *value)
|
|
|
|
|
{
|
|
|
|
|
value_free_to_mark ((struct value *) value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free all values allocated since MARK was obtained by value_mark
|
|
|
|
|
(except for those released) when the cleanup is run. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_value_free_to_mark (struct value *mark)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_value_free_to_mark, mark);
|
2011-05-13 12:34:25 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-13 23:44:49 +08:00
|
|
|
|
/* Helper for make_cleanup_value_free. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_value_free (void *value)
|
|
|
|
|
{
|
|
|
|
|
value_free (value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free VALUE. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_value_free (struct value *value)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_value_free, value);
|
2011-05-13 23:44:49 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-14 15:55:26 +08:00
|
|
|
|
/* Helper for make_cleanup_free_so. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_free_so (void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct so_list *so = arg;
|
|
|
|
|
|
|
|
|
|
free_so (so);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make cleanup handler calling free_so for SO. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_free_so (struct so_list *so)
|
|
|
|
|
{
|
2012-04-18 04:48:20 +08:00
|
|
|
|
return make_cleanup (do_free_so, so);
|
2011-10-14 15:55:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* This function is useful for cleanups.
|
|
|
|
|
Do
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
foo = xmalloc (...);
|
|
|
|
|
old_chain = make_cleanup (free_current_contents, &foo);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
to arrange to free the object thus allocated. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-04-21 12:10:18 +08:00
|
|
|
|
free_current_contents (void *ptr)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2000-04-21 12:10:18 +08:00
|
|
|
|
void **location = ptr;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2000-05-16 12:57:49 +08:00
|
|
|
|
if (location == NULL)
|
2001-02-08 14:03:54 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("free_current_contents: NULL pointer"));
|
2000-04-21 12:10:18 +08:00
|
|
|
|
if (*location != NULL)
|
2000-05-16 12:57:49 +08:00
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (*location);
|
2000-05-16 12:57:49 +08:00
|
|
|
|
*location = NULL;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2010-06-26 14:44:47 +08:00
|
|
|
|
/* If nonzero, display time usage both at startup and for each command. */
|
|
|
|
|
|
|
|
|
|
static int display_time;
|
|
|
|
|
|
|
|
|
|
/* If nonzero, display space usage both at startup and for each command. */
|
|
|
|
|
|
|
|
|
|
static int display_space;
|
|
|
|
|
|
|
|
|
|
/* Records a run time and space usage to be used as a base for
|
|
|
|
|
reporting elapsed time or change in space. In addition,
|
|
|
|
|
the msg_type field indicates whether the saved time is from the
|
|
|
|
|
beginning of GDB execution (0) or the beginning of an individual
|
|
|
|
|
command execution (1). */
|
|
|
|
|
struct cmd_stats
|
|
|
|
|
{
|
|
|
|
|
int msg_type;
|
2011-11-05 00:45:13 +08:00
|
|
|
|
long start_cpu_time;
|
|
|
|
|
struct timeval start_wall_time;
|
2010-06-26 14:44:47 +08:00
|
|
|
|
long start_space;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Set whether to display time statistics to NEW_VALUE (non-zero
|
|
|
|
|
means true). */
|
|
|
|
|
void
|
|
|
|
|
set_display_time (int new_value)
|
|
|
|
|
{
|
|
|
|
|
display_time = new_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set whether to display space statistics to NEW_VALUE (non-zero
|
|
|
|
|
means true). */
|
|
|
|
|
void
|
|
|
|
|
set_display_space (int new_value)
|
|
|
|
|
{
|
|
|
|
|
display_space = new_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* As indicated by display_time and display_space, report GDB's elapsed time
|
|
|
|
|
and space usage from the base time and space provided in ARG, which
|
2011-01-12 09:23:29 +08:00
|
|
|
|
must be a pointer to a struct cmd_stat. This function is intended
|
|
|
|
|
to be called as a cleanup. */
|
2010-06-26 14:44:47 +08:00
|
|
|
|
static void
|
|
|
|
|
report_command_stats (void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct cmd_stats *start_stats = (struct cmd_stats *) arg;
|
|
|
|
|
int msg_type = start_stats->msg_type;
|
|
|
|
|
|
|
|
|
|
if (display_time)
|
|
|
|
|
{
|
2011-11-05 00:45:13 +08:00
|
|
|
|
long cmd_time = get_run_time () - start_stats->start_cpu_time;
|
|
|
|
|
struct timeval now_wall_time, delta_wall_time;
|
|
|
|
|
|
|
|
|
|
gettimeofday (&now_wall_time, NULL);
|
|
|
|
|
timeval_sub (&delta_wall_time,
|
|
|
|
|
&now_wall_time, &start_stats->start_wall_time);
|
2010-06-26 14:44:47 +08:00
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* Subtract time spend in prompt_for_continue from walltime. */
|
|
|
|
|
timeval_sub (&delta_wall_time,
|
|
|
|
|
&delta_wall_time, &prompt_for_continue_wait_time);
|
|
|
|
|
|
2010-06-26 14:44:47 +08:00
|
|
|
|
printf_unfiltered (msg_type == 0
|
2011-11-05 00:45:13 +08:00
|
|
|
|
? _("Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n")
|
|
|
|
|
: _("Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"),
|
|
|
|
|
cmd_time / 1000000, cmd_time % 1000000,
|
2011-11-17 02:14:53 +08:00
|
|
|
|
(long) delta_wall_time.tv_sec,
|
|
|
|
|
(long) delta_wall_time.tv_usec);
|
2010-06-26 14:44:47 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (display_space)
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_SBRK
|
|
|
|
|
char *lim = (char *) sbrk (0);
|
|
|
|
|
|
|
|
|
|
long space_now = lim - lim_at_start;
|
|
|
|
|
long space_diff = space_now - start_stats->start_space;
|
|
|
|
|
|
|
|
|
|
printf_unfiltered (msg_type == 0
|
2011-04-02 01:20:42 +08:00
|
|
|
|
? _("Space used: %ld (%s%ld during startup)\n")
|
|
|
|
|
: _("Space used: %ld (%s%ld for this command)\n"),
|
2010-06-26 14:44:47 +08:00
|
|
|
|
space_now,
|
2011-04-02 01:20:42 +08:00
|
|
|
|
(space_diff >= 0 ? "+" : ""),
|
2010-06-26 14:44:47 +08:00
|
|
|
|
space_diff);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a cleanup that reports time and space used since its
|
|
|
|
|
creation. Precise messages depend on MSG_TYPE:
|
|
|
|
|
0: Initial time/space
|
|
|
|
|
1: Individual command time/space. */
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_command_stats_cleanup (int msg_type)
|
|
|
|
|
{
|
2012-08-09 05:55:01 +08:00
|
|
|
|
static const struct timeval zero_timeval = { 0 };
|
2010-06-26 14:44:47 +08:00
|
|
|
|
struct cmd_stats *new_stat = XMALLOC (struct cmd_stats);
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_SBRK
|
|
|
|
|
char *lim = (char *) sbrk (0);
|
|
|
|
|
new_stat->start_space = lim - lim_at_start;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
new_stat->msg_type = msg_type;
|
2011-11-05 00:45:13 +08:00
|
|
|
|
new_stat->start_cpu_time = get_run_time ();
|
|
|
|
|
gettimeofday (&new_stat->start_wall_time, NULL);
|
2010-06-26 14:44:47 +08:00
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* Initalize timer to keep track of how long we waited for the user. */
|
|
|
|
|
prompt_for_continue_wait_time = zero_timeval;
|
|
|
|
|
|
2010-06-26 14:44:47 +08:00
|
|
|
|
return make_cleanup_dtor (report_command_stats, new_stat, xfree);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2003-02-01 06:45:22 +08:00
|
|
|
|
|
2002-01-31 12:10:51 +08:00
|
|
|
|
/* Print a warning message. The first argument STRING is the warning
|
|
|
|
|
message, used as an fprintf format string, the second is the
|
|
|
|
|
va_list of arguments for that string. A warning is unfiltered (not
|
|
|
|
|
paginated) so that the user does not need to page through each
|
|
|
|
|
screen full of warnings when there are lots of them. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
2002-01-31 12:10:51 +08:00
|
|
|
|
vwarning (const char *string, va_list args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_warning_hook)
|
|
|
|
|
(*deprecated_warning_hook) (string, args);
|
2002-01-31 12:10:51 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
target_terminal_ours ();
|
2011-01-12 09:23:29 +08:00
|
|
|
|
wrap_here (""); /* Force out any buffered output. */
|
2002-01-31 12:10:51 +08:00
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
if (warning_pre_print)
|
2003-08-04 David Carlton <carlton@kealia.com>
* charset.c (cached_iconv_convert): Add __FILE__ and __LINE__ args
to internal_error call.
* source.c (forward_search_command): Add "%s" format argument.
(reverse_search_command): Ditto.
* top.c (quit_confirm): Ditto.
* cli/cli-setshow.c (do_setshow_command): Ditto.
* cp-valprint.c (cp_print_class_method): Replace
{f,}printf_{un,}filtered by {f,}puts_{un,}filtered.
(cp_print_class_member): Ditto.
* event-top.c (command_line_handler): Ditto.
* linux-proc.c (linux_info_proc_cmd): Ditto.
* p-typeprint.c (pascal_type_print_base): Ditto.
* p-valprint.c (pascal_object_print_class_method): Ditto.
(pascal_object_print_class_member): Ditto.
* printcmd.c (print_scalar_formatted,printf_command): Ditto.
* remote.c (remote_cisco_section_offsets): Ditto.
* top.c (command_line_input): Ditto.
* utils.c (vwarning,error_stream,quit): Ditto.
* valprint.c (print_floating,print_binary_chars)
(print_octal_chars,print_decimal_chars,print_hex_chars): Ditto.
2003-08-04 David Carlton <carlton@kealia.com>
* mi-main.c (mi_error_last_message): Add "%s" second argument to
xasprintf call.
2003-08-04 David Carlton <carlton@kealia.com>
* generic/gdbtk.c (gdbtk_source_start_file): Add "%s" first
argument to error call.
(tk_command): Ditto.
(view_command): Ditto.
2003-08-05 01:08:24 +08:00
|
|
|
|
fputs_unfiltered (warning_pre_print, gdb_stderr);
|
2002-01-31 12:10:51 +08:00
|
|
|
|
vfprintf_unfiltered (gdb_stderr, string, args);
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, "\n");
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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
|
2003-02-01 06:45:22 +08:00
|
|
|
|
warning (const char *string, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, string);
|
2002-01-31 12:10:51 +08:00
|
|
|
|
vwarning (string, args);
|
|
|
|
|
va_end (args);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
1999-11-17 10:31:06 +08:00
|
|
|
|
verror (const char *string, va_list args)
|
|
|
|
|
{
|
2005-01-13 Andrew Cagney <cagney@gnu.org>
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
(do_write, error_stream_1): Delete function.
(error_stream): Simplify, call error.
(error_last_message, error_init, gdb_lasterr): Delete.
(error_silent): Simplify, call throw_vsilent.
* mi/mi-interp.c (mi_cmd_interpreter_exec): Dup the message.
* main.c (captured_main): Delete call to error_init.
* exceptions.c (throw_verror, throw_verror)
(throw_vsilent): New functions.
(do_write, print_and_throw): New functions.
(last_message): New global.
(throw_reason): Replace error_last_message with last_message.
(catch_exceptions_with_msg): Dup the message.
* exceptions.h (throw_verror, throw_vfatal, throw_vsilent):
Declare.
2005-01-14 09:20:38 +08:00
|
|
|
|
throw_verror (GENERIC_ERROR, string, args);
|
1999-11-17 10:31:06 +08:00
|
|
|
|
}
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
error (const char *string, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, string);
|
2005-01-13 Andrew Cagney <cagney@gnu.org>
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
(do_write, error_stream_1): Delete function.
(error_stream): Simplify, call error.
(error_last_message, error_init, gdb_lasterr): Delete.
(error_silent): Simplify, call throw_vsilent.
* mi/mi-interp.c (mi_cmd_interpreter_exec): Dup the message.
* main.c (captured_main): Delete call to error_init.
* exceptions.c (throw_verror, throw_verror)
(throw_vsilent): New functions.
(do_write, print_and_throw): New functions.
(last_message): New global.
(throw_reason): Replace error_last_message with last_message.
(catch_exceptions_with_msg): Dup the message.
* exceptions.h (throw_verror, throw_vfatal, throw_vsilent):
Declare.
2005-01-14 09:20:38 +08:00
|
|
|
|
throw_verror (GENERIC_ERROR, string, args);
|
1999-11-17 10:31:06 +08:00
|
|
|
|
va_end (args);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-06 04:32:04 +08:00
|
|
|
|
/* 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. */
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2004-11-06 04:32:04 +08:00
|
|
|
|
vfatal (const char *string, va_list args)
|
|
|
|
|
{
|
2005-01-13 Andrew Cagney <cagney@gnu.org>
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
(do_write, error_stream_1): Delete function.
(error_stream): Simplify, call error.
(error_last_message, error_init, gdb_lasterr): Delete.
(error_silent): Simplify, call throw_vsilent.
* mi/mi-interp.c (mi_cmd_interpreter_exec): Dup the message.
* main.c (captured_main): Delete call to error_init.
* exceptions.c (throw_verror, throw_verror)
(throw_vsilent): New functions.
(do_write, print_and_throw): New functions.
(last_message): New global.
(throw_reason): Replace error_last_message with last_message.
(catch_exceptions_with_msg): Dup the message.
* exceptions.h (throw_verror, throw_vfatal, throw_vsilent):
Declare.
2005-01-14 09:20:38 +08:00
|
|
|
|
throw_vfatal (string, args);
|
2004-11-06 04:32:04 +08:00
|
|
|
|
}
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2004-11-06 04:32:04 +08:00
|
|
|
|
fatal (const char *string, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2004-11-06 04:32:04 +08:00
|
|
|
|
va_start (args, string);
|
2005-01-13 Andrew Cagney <cagney@gnu.org>
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
(do_write, error_stream_1): Delete function.
(error_stream): Simplify, call error.
(error_last_message, error_init, gdb_lasterr): Delete.
(error_silent): Simplify, call throw_vsilent.
* mi/mi-interp.c (mi_cmd_interpreter_exec): Dup the message.
* main.c (captured_main): Delete call to error_init.
* exceptions.c (throw_verror, throw_verror)
(throw_vsilent): New functions.
(do_write, print_and_throw): New functions.
(last_message): New global.
(throw_reason): Replace error_last_message with last_message.
(catch_exceptions_with_msg): Dup the message.
* exceptions.h (throw_verror, throw_vfatal, throw_vsilent):
Declare.
2005-01-14 09:20:38 +08:00
|
|
|
|
throw_vfatal (string, args);
|
2004-11-06 04:32:04 +08:00
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2004-11-06 04:32:04 +08:00
|
|
|
|
error_stream (struct ui_file *stream)
|
1999-10-06 07:13:56 +08:00
|
|
|
|
{
|
2009-08-14 08:32:33 +08:00
|
|
|
|
char *message = ui_file_xstrdup (stream, NULL);
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2005-01-13 Andrew Cagney <cagney@gnu.org>
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
(do_write, error_stream_1): Delete function.
(error_stream): Simplify, call error.
(error_last_message, error_init, gdb_lasterr): Delete.
(error_silent): Simplify, call throw_vsilent.
* mi/mi-interp.c (mi_cmd_interpreter_exec): Dup the message.
* main.c (captured_main): Delete call to error_init.
* exceptions.c (throw_verror, throw_verror)
(throw_vsilent): New functions.
(do_write, print_and_throw): New functions.
(last_message): New global.
(throw_reason): Replace error_last_message with last_message.
(catch_exceptions_with_msg): Dup the message.
* exceptions.h (throw_verror, throw_vfatal, throw_vsilent):
Declare.
2005-01-14 09:20:38 +08:00
|
|
|
|
make_cleanup (xfree, message);
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 12:06:14 +08:00
|
|
|
|
error (("%s"), message);
|
1999-10-06 07:13:56 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2010-01-15 08:34:37 +08:00
|
|
|
|
/* Dump core trying to increase the core soft limit to hard limit first. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dump_core (void)
|
|
|
|
|
{
|
|
|
|
|
#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(). */
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
/* Check whether GDB will be able to dump core using the dump_core
|
|
|
|
|
function. */
|
2010-01-15 08:34:37 +08:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
can_dump_core (const char *reason)
|
|
|
|
|
{
|
|
|
|
|
#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;
|
|
|
|
|
|
|
|
|
|
if (rlim.rlim_max == 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stderr,
|
2011-01-06 06:22:53 +08:00
|
|
|
|
_("%s\nUnable to dump core, use `ulimit -c"
|
|
|
|
|
" unlimited' before executing GDB next time.\n"),
|
|
|
|
|
reason);
|
2010-01-15 08:34:37 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE_GETRLIMIT */
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-27 00:24:27 +08:00
|
|
|
|
/* Allow the user to configure the debugger behavior with respect to
|
|
|
|
|
what to do when an internal problem is detected. */
|
|
|
|
|
|
|
|
|
|
const char internal_problem_ask[] = "ask";
|
|
|
|
|
const char internal_problem_yes[] = "yes";
|
|
|
|
|
const char internal_problem_no[] = "no";
|
2012-01-29 02:08:22 +08:00
|
|
|
|
static const char *const internal_problem_modes[] =
|
2009-01-27 00:24:27 +08:00
|
|
|
|
{
|
|
|
|
|
internal_problem_ask,
|
|
|
|
|
internal_problem_yes,
|
|
|
|
|
internal_problem_no,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Print a message reporting an internal error/warning. Ask the user
|
2002-09-19 07:53:52 +08:00
|
|
|
|
if they want to continue, dump core, or just exit. Return
|
|
|
|
|
something to indicate a quit. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-09-19 07:53:52 +08:00
|
|
|
|
struct internal_problem
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2002-09-19 07:53:52 +08:00
|
|
|
|
const char *name;
|
2009-01-27 00:24:27 +08:00
|
|
|
|
const char *should_quit;
|
|
|
|
|
const char *should_dump_core;
|
2002-09-19 07:53:52 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Report a problem, internal to GDB, to the user. Once the problem
|
|
|
|
|
has been reported, and assuming GDB didn't quit, the caller can
|
|
|
|
|
either allow execution to resume or throw an error. */
|
|
|
|
|
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-03 05:14:59 +08:00
|
|
|
|
static void ATTRIBUTE_PRINTF (4, 0)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
internal_vproblem (struct internal_problem *problem,
|
2003-02-01 06:45:22 +08:00
|
|
|
|
const char *file, int line, const char *fmt, va_list ap)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
{
|
|
|
|
|
static int dejavu;
|
2002-01-18 07:33:39 +08:00
|
|
|
|
int quit_p;
|
1999-08-17 03:57:19 +08:00
|
|
|
|
int dump_core_p;
|
2003-06-27 01:25:25 +08:00
|
|
|
|
char *reason;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-09-19 07:53:52 +08:00
|
|
|
|
/* Don't allow infinite error/warning recursion. */
|
2003-06-27 01:25:25 +08:00
|
|
|
|
{
|
|
|
|
|
static char msg[] = "Recursive internal problem.\n";
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2003-06-27 01:25:25 +08:00
|
|
|
|
switch (dejavu)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
dejavu = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
dejavu = 2;
|
|
|
|
|
fputs_unfiltered (msg, gdb_stderr);
|
2010-01-15 08:34:37 +08:00
|
|
|
|
abort (); /* NOTE: GDB has only three calls to abort(). */
|
2003-06-27 01:25:25 +08:00
|
|
|
|
default:
|
|
|
|
|
dejavu = 3;
|
2009-01-07 02:31:59 +08:00
|
|
|
|
/* Newer GLIBC versions put the warn_unused_result attribute
|
|
|
|
|
on write, but this is one of those rare cases where
|
|
|
|
|
ignoring the return value is correct. Casting to (void)
|
|
|
|
|
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))
|
2010-01-15 08:34:37 +08:00
|
|
|
|
abort (); /* NOTE: GDB has only three calls to abort(). */
|
2003-06-27 01:25:25 +08:00
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-09-19 07:53:52 +08:00
|
|
|
|
/* Try to get the message out and at the start of a new line. */
|
2000-04-27 08:15:14 +08:00
|
|
|
|
target_terminal_ours ();
|
2002-09-19 07:53:52 +08:00
|
|
|
|
begin_line ();
|
|
|
|
|
|
2003-06-27 01:25:25 +08:00
|
|
|
|
/* 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
|
|
|
|
|
style similar to a compiler error message. Include extra detail
|
|
|
|
|
so that the user knows that they are living on the edge. */
|
|
|
|
|
{
|
|
|
|
|
char *msg;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2004-06-29 22:57:39 +08:00
|
|
|
|
msg = xstrvprintf (fmt, ap);
|
2011-01-06 06:22:53 +08:00
|
|
|
|
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);
|
2003-06-27 01:25:25 +08:00
|
|
|
|
xfree (msg);
|
|
|
|
|
make_cleanup (xfree, reason);
|
|
|
|
|
}
|
1999-08-17 03:57:19 +08:00
|
|
|
|
|
2009-01-27 00:24:27 +08:00
|
|
|
|
if (problem->should_quit == internal_problem_ask)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
{
|
|
|
|
|
/* Default (yes/batch case) is to quit GDB. When in batch mode
|
2009-01-27 00:24:27 +08:00
|
|
|
|
this lessens the likelihood of GDB going into an infinite
|
|
|
|
|
loop. */
|
2012-01-24 01:12:30 +08:00
|
|
|
|
if (!confirm)
|
2009-07-22 02:21:02 +08:00
|
|
|
|
{
|
|
|
|
|
/* Emit the message and quit. */
|
|
|
|
|
fputs_unfiltered (reason, gdb_stderr);
|
|
|
|
|
fputs_unfiltered ("\n", gdb_stderr);
|
|
|
|
|
quit_p = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
quit_p = query (_("%s\nQuit this debugging session? "), reason);
|
2002-09-19 07:53:52 +08:00
|
|
|
|
}
|
2009-01-27 00:24:27 +08:00
|
|
|
|
else if (problem->should_quit == internal_problem_yes)
|
|
|
|
|
quit_p = 1;
|
|
|
|
|
else if (problem->should_quit == internal_problem_no)
|
|
|
|
|
quit_p = 0;
|
|
|
|
|
else
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
2002-09-19 07:53:52 +08:00
|
|
|
|
|
2009-01-27 00:24:27 +08:00
|
|
|
|
if (problem->should_dump_core == internal_problem_ask)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
{
|
2010-01-15 08:34:37 +08:00
|
|
|
|
if (!can_dump_core (reason))
|
|
|
|
|
dump_core_p = 0;
|
|
|
|
|
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);
|
|
|
|
|
}
|
2002-09-19 07:53:52 +08:00
|
|
|
|
}
|
2009-01-27 00:24:27 +08:00
|
|
|
|
else if (problem->should_dump_core == internal_problem_yes)
|
2010-01-15 08:34:37 +08:00
|
|
|
|
dump_core_p = can_dump_core (reason);
|
2009-01-27 00:24:27 +08:00
|
|
|
|
else if (problem->should_dump_core == internal_problem_no)
|
|
|
|
|
dump_core_p = 0;
|
|
|
|
|
else
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
1999-08-17 03:57:19 +08:00
|
|
|
|
|
2002-01-18 07:33:39 +08:00
|
|
|
|
if (quit_p)
|
1999-08-17 03:57:19 +08:00
|
|
|
|
{
|
|
|
|
|
if (dump_core_p)
|
2010-01-15 08:34:37 +08:00
|
|
|
|
dump_core ();
|
2002-01-18 07:33:39 +08:00
|
|
|
|
else
|
|
|
|
|
exit (1);
|
1999-08-17 03:57:19 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (dump_core_p)
|
2002-01-18 07:33:39 +08:00
|
|
|
|
{
|
2005-03-16 23:58:41 +08:00
|
|
|
|
#ifdef HAVE_WORKING_FORK
|
2002-01-18 07:33:39 +08:00
|
|
|
|
if (fork () == 0)
|
2010-01-15 08:34:37 +08:00
|
|
|
|
dump_core ();
|
2005-03-16 23:58:41 +08:00
|
|
|
|
#endif
|
2002-01-18 07:33:39 +08:00
|
|
|
|
}
|
1999-08-17 03:57:19 +08:00
|
|
|
|
}
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
|
|
|
|
dejavu = 0;
|
2002-09-19 07:53:52 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct internal_problem internal_error_problem = {
|
2009-01-27 00:24:27 +08:00
|
|
|
|
"internal-error", internal_problem_ask, internal_problem_ask
|
2002-09-19 07:53:52 +08:00
|
|
|
|
};
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
internal_verror (const char *file, int line, const char *fmt, va_list ap)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
{
|
|
|
|
|
internal_vproblem (&internal_error_problem, file, line, fmt, ap);
|
2005-01-20 05:15:44 +08:00
|
|
|
|
deprecated_throw_reason (RETURN_ERROR);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2001-02-08 14:03:54 +08:00
|
|
|
|
internal_error (const char *file, int line, const char *string, ...)
|
1999-11-17 10:31:06 +08:00
|
|
|
|
{
|
|
|
|
|
va_list ap;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-11-17 10:31:06 +08:00
|
|
|
|
va_start (ap, string);
|
2001-02-08 14:03:54 +08:00
|
|
|
|
internal_verror (file, line, string, ap);
|
1999-11-17 10:31:06 +08:00
|
|
|
|
va_end (ap);
|
|
|
|
|
}
|
|
|
|
|
|
2002-09-19 07:53:52 +08:00
|
|
|
|
static struct internal_problem internal_warning_problem = {
|
2009-01-27 00:24:27 +08:00
|
|
|
|
"internal-warning", internal_problem_ask, internal_problem_ask
|
2002-09-19 07:53:52 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
internal_vwarning (const char *file, int line, const char *fmt, va_list ap)
|
2002-09-19 07:53:52 +08:00
|
|
|
|
{
|
|
|
|
|
internal_vproblem (&internal_warning_problem, file, line, fmt, ap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
internal_warning (const char *file, int line, const char *string, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list ap;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2002-09-19 07:53:52 +08:00
|
|
|
|
va_start (ap, string);
|
|
|
|
|
internal_vwarning (file, line, string, ap);
|
|
|
|
|
va_end (ap);
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-27 00:24:27 +08:00
|
|
|
|
/* Dummy functions to keep add_prefix_cmd happy. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_internal_problem_cmd (char *args, int from_tty)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
show_internal_problem_cmd (char *args, int from_tty)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* When GDB reports an internal problem (error or warning) it gives
|
|
|
|
|
the user the opportunity to quit GDB and/or create a core file of
|
|
|
|
|
the current debug session. This function registers a few commands
|
|
|
|
|
that make it possible to specify that GDB should always or never
|
|
|
|
|
quit or create a core file, without asking. The commands look
|
|
|
|
|
like:
|
|
|
|
|
|
|
|
|
|
maint set PROBLEM-NAME quit ask|yes|no
|
|
|
|
|
maint show PROBLEM-NAME quit
|
|
|
|
|
maint set PROBLEM-NAME corefile ask|yes|no
|
|
|
|
|
maint show PROBLEM-NAME corefile
|
|
|
|
|
|
|
|
|
|
Where PROBLEM-NAME is currently "internal-error" or
|
|
|
|
|
"internal-warning". */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
add_internal_problem_command (struct internal_problem *problem)
|
|
|
|
|
{
|
|
|
|
|
struct cmd_list_element **set_cmd_list;
|
|
|
|
|
struct cmd_list_element **show_cmd_list;
|
|
|
|
|
char *set_doc;
|
|
|
|
|
char *show_doc;
|
|
|
|
|
|
|
|
|
|
set_cmd_list = xmalloc (sizeof (*set_cmd_list));
|
|
|
|
|
show_cmd_list = xmalloc (sizeof (*set_cmd_list));
|
|
|
|
|
*set_cmd_list = NULL;
|
|
|
|
|
*show_cmd_list = NULL;
|
|
|
|
|
|
|
|
|
|
set_doc = xstrprintf (_("Configure what GDB does when %s is detected."),
|
|
|
|
|
problem->name);
|
|
|
|
|
|
|
|
|
|
show_doc = xstrprintf (_("Show what GDB does when %s is detected."),
|
|
|
|
|
problem->name);
|
|
|
|
|
|
|
|
|
|
add_prefix_cmd ((char*) problem->name,
|
|
|
|
|
class_maintenance, set_internal_problem_cmd, set_doc,
|
|
|
|
|
set_cmd_list,
|
2010-05-05 05:09:25 +08:00
|
|
|
|
concat ("maintenance set ", problem->name, " ",
|
|
|
|
|
(char *) NULL),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
0/*allow-unknown*/, &maintenance_set_cmdlist);
|
|
|
|
|
|
|
|
|
|
add_prefix_cmd ((char*) problem->name,
|
|
|
|
|
class_maintenance, show_internal_problem_cmd, show_doc,
|
|
|
|
|
show_cmd_list,
|
2010-05-05 05:09:25 +08:00
|
|
|
|
concat ("maintenance show ", problem->name, " ",
|
|
|
|
|
(char *) NULL),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
0/*allow-unknown*/, &maintenance_show_cmdlist);
|
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
set_doc = xstrprintf (_("Set whether GDB should quit "
|
|
|
|
|
"when an %s is detected"),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
problem->name);
|
2011-01-06 06:22:53 +08:00
|
|
|
|
show_doc = xstrprintf (_("Show whether GDB will quit "
|
|
|
|
|
"when an %s is detected"),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
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);
|
|
|
|
|
|
2009-08-19 00:17:16 +08:00
|
|
|
|
xfree (set_doc);
|
|
|
|
|
xfree (show_doc);
|
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
set_doc = xstrprintf (_("Set whether GDB should create a core "
|
|
|
|
|
"file of GDB when %s is detected"),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
problem->name);
|
2011-01-06 06:22:53 +08:00
|
|
|
|
show_doc = xstrprintf (_("Show whether GDB will create a core "
|
|
|
|
|
"file of GDB when %s is detected"),
|
2009-01-27 00:24:27 +08:00
|
|
|
|
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);
|
2009-08-19 00:17:16 +08:00
|
|
|
|
|
|
|
|
|
xfree (set_doc);
|
|
|
|
|
xfree (show_doc);
|
2009-01-27 00:24:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* 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. */
|
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2002-02-26 11:29:55 +08:00
|
|
|
|
perror_with_name (const char *string)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *err;
|
|
|
|
|
char *combined;
|
|
|
|
|
|
|
|
|
|
err = safe_strerror (errno);
|
|
|
|
|
combined = (char *) alloca (strlen (err) + strlen (string) + 3);
|
|
|
|
|
strcpy (combined, string);
|
|
|
|
|
strcat (combined, ": ");
|
|
|
|
|
strcat (combined, err);
|
|
|
|
|
|
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
unreasonable. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
bfd_set_error (bfd_error_no_error);
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 12:06:14 +08:00
|
|
|
|
error (_("%s."), combined);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the system error message for ERRCODE, and also mention STRING
|
|
|
|
|
as the file name for which the error was encountered. */
|
|
|
|
|
|
|
|
|
|
void
|
2002-02-26 11:29:55 +08:00
|
|
|
|
print_sys_errmsg (const char *string, int errcode)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *err;
|
|
|
|
|
char *combined;
|
|
|
|
|
|
|
|
|
|
err = safe_strerror (errcode);
|
|
|
|
|
combined = (char *) alloca (strlen (err) + strlen (string) + 3);
|
|
|
|
|
strcpy (combined, string);
|
|
|
|
|
strcat (combined, ": ");
|
|
|
|
|
strcat (combined, err);
|
|
|
|
|
|
|
|
|
|
/* We want anything which was printed on stdout to come out first, before
|
|
|
|
|
this message. */
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, "%s.\n", combined);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Control C eventually causes this to be called, at a convenient time. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
quit (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-08-17 03:57:19 +08:00
|
|
|
|
#ifdef __MSDOS__
|
|
|
|
|
/* No steenking SIGINT will ever be coming our way when the
|
|
|
|
|
program is resumed. Don't lie. */
|
2005-01-20 06:54:56 +08:00
|
|
|
|
fatal ("Quit");
|
1999-08-17 03:57:19 +08:00
|
|
|
|
#else
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (job_control
|
2003-02-01 06:45:22 +08:00
|
|
|
|
/* If there is no terminal switching for this target, then we can't
|
|
|
|
|
possibly get screwed by the lack of job control. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|| current_target.to_terminal_ours == NULL)
|
2005-01-20 06:54:56 +08:00
|
|
|
|
fatal ("Quit");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
else
|
2005-01-20 06:54:56 +08:00
|
|
|
|
fatal ("Quit (expect signal SIGINT when the program is resumed)");
|
1999-08-17 03:57:19 +08:00
|
|
|
|
#endif
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Called when a memory allocation fails, with the number of bytes of
|
2011-01-12 09:23:29 +08:00
|
|
|
|
memory requested in SIZE. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
gdb/
* cli/cli-cmds.h (error_no_arg): Remove. Move the comment ...
* command.h (error_no_arg): ... here. Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Remove.
(perror_with_name, verror, error, error_stream, vfatal, fatal)
(internal_verror, internal_error, nomem): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.c (throw_exception, deprecated_throw_reason, throw_verror)
(throw_vfatal, throw_error): Remove NORETURN.
(throw_it): Remove NORETURN, change ATTR_NORETURN to ATTRIBUTE_NORETURN.
* exceptions.h (throw_exception, throw_verror, throw_vfatal)
(throw_error, deprecated_throw_reason): Remove NORETURN, change
ATTR_NORETURN to ATTRIBUTE_NORETURN.
* linespec.c (cplusplus_error): Remove NORETURN, change ATTR_NORETURN
to ATTRIBUTE_NORETURN for prototype, for the definition only remove
NORETURN.
* remote-mips.c (mips_error): Change NORETURN to ATTRIBUTE_NORETURN.
* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* target.c (tcomplain): Likewise.
* target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
* utils.c (verror, error, vfatal, fatal, error_stream, internal_verror)
(internal_error, perror_with_name, nomem): Remove NORETURN.
* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to
ATTRIBUTE_NORETURN.
gdb/doc/
* gdbint.texinfo (Host Definition): Remove items NORETURN and
ATTR_NORETURN.
2010-05-03 07:52:14 +08:00
|
|
|
|
void
|
2011-07-22 Kwok Cheung Yeung <kcy@codesourcery.com>
gdb/
* defs.h: Add guard against inclusion in gdbserver.
(struct ptid, ptid_t): Move to common/ptid.h.
(xfree, xzalloc, xasprintf, xvasprintf, xstrprintf, xstrvprintf,
xsnprintf, internal_error): Move to common/common-utils.h.
(nomem): Delete.
* gdb_assert.h: Move into common/ sub-directory.
* gdb_locale.h: Ditto.
* gdb_dirent.h: Ditto.
* inferior.h (minus_one_ptid, null_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid):
Move into common/ptid.h.
* xml-support.c (xml_escape_text): Move into common/xml-utils.c.
(gdb_xml_create_parser_and_cleanup_1, xml_fetch_context_from_file):
Change nomem to malloc_failure.
* xml-support.h (xml_escape_text): Move into common/xml-utils.h.
* utils.c (nomem): Rename to malloc_failure.
(xmalloc, xzalloc, xrealloc, xcalloc, xfree, xstrprintf, xasprintf,
xvasprintf, xstrvprintf, xsnprintf): Move to common/common-utils.c.
(gdb_buildargv): Change nomem to malloc_failure.
* infrun.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal,
ptid_is_pid): Move into common/ptid.c.
(initialize_infrun): Delete initialization of null_ptid and
minus_one_ptid.
* linux-nat.c (linux_nat_xfer_osdata): Defer to
linux_common_xfer_osdata.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/ptid.c and common/buffer.c.
(HFILES_NO_SRCDIR): Add common/common-utils.h, common/xml-utils.h,
common/ptid.h, common/buffer.h and common/linux-osdata.h.
(COMMON_OBS): Add xml-utils.o, common-utils.o, buffer.o and ptid.o.
(common-utils.o, xml-utils.o, ptid.o, buffer.o, linux-osdata.o): New
rules.
* common/gdb_assert.h: New.
* common/gdb_dirent.h: New.
* common/gdb_locale.h: New.
* common/buffer.c: New.
* common/buffer.h: New.
* common/ptid.c: New.
* common/ptid.h: New.
* common/xml-utils.c: New.
* common/xml-utils.h: New.
* common/common-utils.c: New.
* common/common-utils.h: New.
* common/linux-osdata.c: New.
* common/linux-osdata.h: New.
* config/alpha/alpha-linux.mh (NATDEPFILES): Add linux-osdata.o.
* config/arm/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux64.mh (NATDEPFILES): Ditto.
* config/ia64/linux.mh (NATDEPFILES): Ditto.
* config/m32r/linux.mh (NATDEPFILES): Ditto.
* config/m68k/linux.mh (NATDEPFILES): Ditto.
* config/mips/linux.mh (NATDEPFILES): Ditto.
* config/pa/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/ppc64-linux.mh (NATDEPFILES): Ditto.
* config/s390/s390.mh (NATDEPFILES): Ditto.
* config/sparc/linux.mh (NATDEPFILES): Ditto.
* config/sparc/linux64.mh (NATDEPFILES): Ditto.
* config/xtensa/linux.mh (NATDEPFILES): Ditto.
gdbserver/
* linux-low.c (compare_ints, unique, list_threads, show_process,
linux_core_of_thread): Delete.
(linux_target_ops): Change linux_core_of_thread to
linux_common_core_of_thread.
(linux_qxfer_osdata): Defer to linux_common_xfer_osdata.
* utils.c (malloc_failure): Change type of argument.
(xmalloc, xrealloc, xcalloc, xsnprintf): Delete.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/linux-osdata.c, common/ptid.c and common/buffer.c.
(OBS): Add xml-utils.o, common-utils.o, ptid.o and buffer.o.
(IPA_OBJS): Add common-utils-ipa.o.
(ptid_h, linux_osdata_h): New macros.
(server_h): Add common/common-utils.h, common/xml-utils.h,
common/buffer.h, common/gdb_assert.h, common/gdb_locale.h and
common/ptid.h.
(common-utils-ipa.o, common-utils.o, xml-utils.o, linux-osdata.o,
ptid.o, buffer.o): New rules.
(linux-low.o): Add common/linux-osdata.h as a dependency.
* configure.srv (srv_tgtobj): Add linux-osdata.o to Linux targets.
* configure.ac: Add AC_HEADER_DIRENT check.
* config.in: Regenerate.
* configure: Regenerate.
* remote-utils.c (xml_escape_text): Delete.
(buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf): Move to common/buffer.c.
* server.c (main): Remove call to initialize_inferiors.
* server.h (struct ptid, ptid_t, minus_one_ptid, null_ptid,
ptid_build, pid_to_ptid, ptid_get_pid, ptid_get_lwp, ptid_get_tid,
ptid_equal, ptid_is_pid, initialize_inferiors, xml_escape_text,
internal_error, gdb_assert, gdb_assert_fail): Delete.
(struct buffer, buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf, buffer_grow_str, buffer_grow_str0): Move to
common/buffer.h.
* inferiors.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid,
initialize_inferiors): Delete.
2011-07-22 07:46:12 +08:00
|
|
|
|
malloc_failure (long size)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (size > 0)
|
|
|
|
|
{
|
2001-02-08 14:03:54 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("virtual memory exhausted: can't allocate %ld bytes."),
|
2003-02-01 06:45:22 +08:00
|
|
|
|
size);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, _("virtual memory exhausted."));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* My replacement for the read system call.
|
|
|
|
|
Used like `read' but keeps going if `read' returns too soon. */
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
myread (int desc, char *addr, int len)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-15 00:32:14 +08:00
|
|
|
|
int val;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
int orglen = len;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
2011-07-22 Kwok Cheung Yeung <kcy@codesourcery.com>
gdb/
* defs.h: Add guard against inclusion in gdbserver.
(struct ptid, ptid_t): Move to common/ptid.h.
(xfree, xzalloc, xasprintf, xvasprintf, xstrprintf, xstrvprintf,
xsnprintf, internal_error): Move to common/common-utils.h.
(nomem): Delete.
* gdb_assert.h: Move into common/ sub-directory.
* gdb_locale.h: Ditto.
* gdb_dirent.h: Ditto.
* inferior.h (minus_one_ptid, null_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid):
Move into common/ptid.h.
* xml-support.c (xml_escape_text): Move into common/xml-utils.c.
(gdb_xml_create_parser_and_cleanup_1, xml_fetch_context_from_file):
Change nomem to malloc_failure.
* xml-support.h (xml_escape_text): Move into common/xml-utils.h.
* utils.c (nomem): Rename to malloc_failure.
(xmalloc, xzalloc, xrealloc, xcalloc, xfree, xstrprintf, xasprintf,
xvasprintf, xstrvprintf, xsnprintf): Move to common/common-utils.c.
(gdb_buildargv): Change nomem to malloc_failure.
* infrun.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal,
ptid_is_pid): Move into common/ptid.c.
(initialize_infrun): Delete initialization of null_ptid and
minus_one_ptid.
* linux-nat.c (linux_nat_xfer_osdata): Defer to
linux_common_xfer_osdata.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/ptid.c and common/buffer.c.
(HFILES_NO_SRCDIR): Add common/common-utils.h, common/xml-utils.h,
common/ptid.h, common/buffer.h and common/linux-osdata.h.
(COMMON_OBS): Add xml-utils.o, common-utils.o, buffer.o and ptid.o.
(common-utils.o, xml-utils.o, ptid.o, buffer.o, linux-osdata.o): New
rules.
* common/gdb_assert.h: New.
* common/gdb_dirent.h: New.
* common/gdb_locale.h: New.
* common/buffer.c: New.
* common/buffer.h: New.
* common/ptid.c: New.
* common/ptid.h: New.
* common/xml-utils.c: New.
* common/xml-utils.h: New.
* common/common-utils.c: New.
* common/common-utils.h: New.
* common/linux-osdata.c: New.
* common/linux-osdata.h: New.
* config/alpha/alpha-linux.mh (NATDEPFILES): Add linux-osdata.o.
* config/arm/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux64.mh (NATDEPFILES): Ditto.
* config/ia64/linux.mh (NATDEPFILES): Ditto.
* config/m32r/linux.mh (NATDEPFILES): Ditto.
* config/m68k/linux.mh (NATDEPFILES): Ditto.
* config/mips/linux.mh (NATDEPFILES): Ditto.
* config/pa/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/ppc64-linux.mh (NATDEPFILES): Ditto.
* config/s390/s390.mh (NATDEPFILES): Ditto.
* config/sparc/linux.mh (NATDEPFILES): Ditto.
* config/sparc/linux64.mh (NATDEPFILES): Ditto.
* config/xtensa/linux.mh (NATDEPFILES): Ditto.
gdbserver/
* linux-low.c (compare_ints, unique, list_threads, show_process,
linux_core_of_thread): Delete.
(linux_target_ops): Change linux_core_of_thread to
linux_common_core_of_thread.
(linux_qxfer_osdata): Defer to linux_common_xfer_osdata.
* utils.c (malloc_failure): Change type of argument.
(xmalloc, xrealloc, xcalloc, xsnprintf): Delete.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/linux-osdata.c, common/ptid.c and common/buffer.c.
(OBS): Add xml-utils.o, common-utils.o, ptid.o and buffer.o.
(IPA_OBJS): Add common-utils-ipa.o.
(ptid_h, linux_osdata_h): New macros.
(server_h): Add common/common-utils.h, common/xml-utils.h,
common/buffer.h, common/gdb_assert.h, common/gdb_locale.h and
common/ptid.h.
(common-utils-ipa.o, common-utils.o, xml-utils.o, linux-osdata.o,
ptid.o, buffer.o): New rules.
(linux-low.o): Add common/linux-osdata.h as a dependency.
* configure.srv (srv_tgtobj): Add linux-osdata.o to Linux targets.
* configure.ac: Add AC_HEADER_DIRENT check.
* config.in: Regenerate.
* configure: Regenerate.
* remote-utils.c (xml_escape_text): Delete.
(buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf): Move to common/buffer.c.
* server.c (main): Remove call to initialize_inferiors.
* server.h (struct ptid, ptid_t, minus_one_ptid, null_ptid,
ptid_build, pid_to_ptid, ptid_get_pid, ptid_get_lwp, ptid_get_tid,
ptid_equal, ptid_is_pid, initialize_inferiors, xml_escape_text,
internal_error, gdb_assert, gdb_assert_fail): Delete.
(struct buffer, buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf, buffer_grow_str, buffer_grow_str0): Move to
common/buffer.h.
* inferiors.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid,
initialize_inferiors): Delete.
2011-07-22 07:46:12 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* 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 *
|
2001-03-07 10:57:08 +08:00
|
|
|
|
savestring (const char *ptr, size_t size)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-15 00:32:14 +08:00
|
|
|
|
char *p = (char *) xmalloc (size + 1);
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
memcpy (p, ptr, size);
|
|
|
|
|
p[size] = 0;
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-17 02:56:35 +08:00
|
|
|
|
print_spaces (int n, struct ui_file *file)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-05-26 02:09:09 +08:00
|
|
|
|
fputs_unfiltered (n_spaces (n), file);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print a host address. */
|
|
|
|
|
|
|
|
|
|
void
|
2003-04-10 10:18:40 +08:00
|
|
|
|
gdb_print_host_address (const void *addr, struct ui_file *stream)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2009-01-07 20:11:07 +08:00
|
|
|
|
fprintf_filtered (stream, "%s", host_address_to_string (addr));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2011-01-18 00:50:42 +08:00
|
|
|
|
/* A cleanup function that calls regfree. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_regfree_cleanup (void *r)
|
|
|
|
|
{
|
|
|
|
|
regfree (r);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a new cleanup that frees the compiled regular expression R. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_regfree_cleanup (regex_t *r)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_regfree_cleanup, r);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return an xmalloc'd error message resulting from a regular
|
|
|
|
|
expression compilation failure. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
get_regcomp_error (int code, regex_t *rx)
|
|
|
|
|
{
|
|
|
|
|
size_t length = regerror (code, rx, NULL, 0);
|
|
|
|
|
char *result = xmalloc (length);
|
|
|
|
|
|
|
|
|
|
regerror (code, rx, result, length);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
/* This function supports the query, nquery, and yquery functions.
|
2004-02-24 03:26:14 +08:00
|
|
|
|
Ask user a y-or-n question and return 0 if answer is no, 1 if
|
2006-10-19 06:16:52 +08:00
|
|
|
|
answer is yes, or default the answer to the specified default
|
|
|
|
|
(for yquery or nquery). DEFCHAR may be 'y' or 'n' to provide a
|
|
|
|
|
default answer, or '\0' for no default.
|
2004-02-24 03:26:14 +08:00
|
|
|
|
CTLSTR is the control string and should end in "? ". It should
|
|
|
|
|
not say how to answer, because we do that.
|
|
|
|
|
ARGS are the arguments passed along with the CTLSTR argument to
|
|
|
|
|
printf. */
|
|
|
|
|
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-03 05:14:59 +08:00
|
|
|
|
static int ATTRIBUTE_PRINTF (1, 0)
|
2004-02-24 03:26:14 +08:00
|
|
|
|
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;
|
2006-10-19 06:16:52 +08:00
|
|
|
|
char *y_string, *n_string, *question;
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* Used to add duration we waited for user to respond to
|
|
|
|
|
prompt_for_continue_wait_time. */
|
|
|
|
|
struct timeval prompt_started, prompt_ended, prompt_delta;
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
|
|
|
|
/* Set up according to which answer is the default. */
|
2006-10-19 06:16:52 +08:00
|
|
|
|
if (defchar == '\0')
|
|
|
|
|
{
|
|
|
|
|
def_value = 1;
|
|
|
|
|
def_answer = 'Y';
|
|
|
|
|
not_def_answer = 'N';
|
|
|
|
|
y_string = "y";
|
|
|
|
|
n_string = "n";
|
|
|
|
|
}
|
|
|
|
|
else if (defchar == 'y')
|
2004-02-24 03:26:14 +08:00
|
|
|
|
{
|
|
|
|
|
def_value = 1;
|
|
|
|
|
def_answer = 'Y';
|
|
|
|
|
not_def_answer = 'N';
|
|
|
|
|
y_string = "[y]";
|
|
|
|
|
n_string = "n";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
def_value = 0;
|
|
|
|
|
def_answer = 'N';
|
|
|
|
|
not_def_answer = 'Y';
|
|
|
|
|
y_string = "y";
|
|
|
|
|
n_string = "[n]";
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
/* Automatically answer the default value if the user did not want
|
2009-08-06 16:19:58 +08:00
|
|
|
|
prompts or the command was issued with the server prefix. */
|
2012-01-24 01:12:30 +08:00
|
|
|
|
if (!confirm || server_command)
|
2006-10-19 06:16:52 +08:00
|
|
|
|
return def_value;
|
|
|
|
|
|
|
|
|
|
/* If input isn't coming from the user directly, just say what
|
2009-07-21 11:31:18 +08:00
|
|
|
|
question we're asking, and then answer the default automatically. This
|
2006-10-19 06:16:52 +08:00
|
|
|
|
way, important error messages don't get lost when talking to GDB
|
|
|
|
|
over a pipe. */
|
2010-07-28 03:11:51 +08:00
|
|
|
|
if (! input_from_terminal_p ())
|
2006-10-19 06:16:52 +08:00
|
|
|
|
{
|
|
|
|
|
wrap_here ("");
|
|
|
|
|
vfprintf_filtered (gdb_stdout, ctlstr, args);
|
|
|
|
|
|
2011-01-06 06:22:53 +08:00
|
|
|
|
printf_filtered (_("(%s or %s) [answered %c; "
|
|
|
|
|
"input not from terminal]\n"),
|
2006-10-19 06:16:52 +08:00
|
|
|
|
y_string, n_string, def_answer);
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
|
|
|
|
|
return def_value;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_query_hook)
|
2004-02-24 03:26:14 +08:00
|
|
|
|
{
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
return deprecated_query_hook (ctlstr, args);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
/* Format the question outside of the loop, to avoid reusing args. */
|
|
|
|
|
question = xstrvprintf (ctlstr, args);
|
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* Used for calculating time spend waiting for user. */
|
|
|
|
|
gettimeofday (&prompt_started, NULL);
|
|
|
|
|
|
2004-02-24 03:26:14 +08:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
2011-01-12 09:23:29 +08:00
|
|
|
|
wrap_here (""); /* Flush any buffered output. */
|
2004-02-24 03:26:14 +08:00
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
|
|
|
|
|
if (annotation_level > 1)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (("\n\032\032pre-query\n"));
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
fputs_filtered (question, gdb_stdout);
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("(%s or %s) "), y_string, n_string);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
|
|
|
|
if (annotation_level > 1)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (("\n\032\032query\n"));
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
|
|
|
|
wrap_here ("");
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
|
|
|
|
|
answer = fgetc (stdin);
|
2009-05-07 06:54:58 +08:00
|
|
|
|
|
|
|
|
|
/* We expect fgetc to block until a character is read. But
|
|
|
|
|
this may not be the case if the terminal was opened with
|
|
|
|
|
the NONBLOCK flag. In that case, if there is nothing to
|
|
|
|
|
read on stdin, fgetc returns EOF, but also sets the error
|
|
|
|
|
condition flag on stdin and errno to EAGAIN. With a true
|
|
|
|
|
EOF, stdin's error condition flag is not set.
|
|
|
|
|
|
|
|
|
|
A situation where this behavior was observed is a pseudo
|
|
|
|
|
terminal on AIX. */
|
|
|
|
|
while (answer == EOF && ferror (stdin) && errno == EAGAIN)
|
|
|
|
|
{
|
|
|
|
|
/* Not a real EOF. Wait a little while and try again until
|
|
|
|
|
we read something. */
|
|
|
|
|
clearerr (stdin);
|
|
|
|
|
gdb_usleep (10000);
|
|
|
|
|
answer = fgetc (stdin);
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-24 03:26:14 +08:00
|
|
|
|
clearerr (stdin); /* in case of C-d */
|
|
|
|
|
if (answer == EOF) /* C-d */
|
|
|
|
|
{
|
2006-12-07 00:49:57 +08:00
|
|
|
|
printf_filtered ("EOF [assumed %c]\n", def_answer);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
retval = def_value;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Eat rest of input line, to EOF or newline. */
|
2004-02-24 03:26:14 +08:00
|
|
|
|
if (answer != '\n')
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
ans2 = fgetc (stdin);
|
|
|
|
|
clearerr (stdin);
|
|
|
|
|
}
|
|
|
|
|
while (ans2 != EOF && ans2 != '\n' && ans2 != '\r');
|
|
|
|
|
|
|
|
|
|
if (answer >= 'a')
|
|
|
|
|
answer -= 040;
|
|
|
|
|
/* Check answer. For the non-default, the user must specify
|
|
|
|
|
the non-default explicitly. */
|
|
|
|
|
if (answer == not_def_answer)
|
|
|
|
|
{
|
|
|
|
|
retval = !def_value;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2006-10-19 06:16:52 +08:00
|
|
|
|
/* Otherwise, if a default was specified, the user may either
|
|
|
|
|
specify the required input or have it default by entering
|
|
|
|
|
nothing. */
|
|
|
|
|
if (answer == def_answer
|
|
|
|
|
|| (defchar != '\0' &&
|
|
|
|
|
(answer == '\n' || answer == '\r' || answer == EOF)))
|
2004-02-24 03:26:14 +08:00
|
|
|
|
{
|
|
|
|
|
retval = def_value;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Invalid entries are not defaulted and require another selection. */
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("Please answer %s or %s.\n"),
|
2004-02-24 03:26:14 +08:00
|
|
|
|
y_string, n_string);
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
xfree (question);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
if (annotation_level > 1)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (("\n\032\032post-query\n"));
|
2004-02-24 03:26:14 +08:00
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Ask user a y-or-n question and return 0 if answer is no, 1 if
|
|
|
|
|
answer is yes, or 0 if answer is defaulted.
|
|
|
|
|
Takes three args which are given to printf to print the question.
|
|
|
|
|
The first, a control string, should end in "? ".
|
|
|
|
|
It should not say how to answer, because we do that. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
nquery (const char *ctlstr, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2011-03-01 06:20:05 +08:00
|
|
|
|
int ret;
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
|
|
|
|
va_start (args, ctlstr);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
ret = defaulted_query (ctlstr, 'n', args);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
va_end (args);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
return ret;
|
2004-02-24 03:26:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ask user a y-or-n question and return 0 if answer is no, 1 if
|
|
|
|
|
answer is yes, or 1 if answer is defaulted.
|
|
|
|
|
Takes three args which are given to printf to print the question.
|
|
|
|
|
The first, a control string, should end in "? ".
|
|
|
|
|
It should not say how to answer, because we do that. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
yquery (const char *ctlstr, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2011-03-01 06:20:05 +08:00
|
|
|
|
int ret;
|
2004-02-24 03:26:14 +08:00
|
|
|
|
|
|
|
|
|
va_start (args, ctlstr);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
ret = defaulted_query (ctlstr, 'y', args);
|
2004-02-24 03:26:14 +08:00
|
|
|
|
va_end (args);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
return ret;
|
2004-02-24 03:26:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
2006-10-19 06:16:52 +08:00
|
|
|
|
/* Ask user a y-or-n question and return 1 iff answer is yes.
|
|
|
|
|
Takes three args which are given to printf to print the question.
|
|
|
|
|
The first, a control string, should end in "? ".
|
|
|
|
|
It should not say how to answer, because we do that. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
query (const char *ctlstr, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2011-03-01 06:20:05 +08:00
|
|
|
|
int ret;
|
2006-10-19 06:16:52 +08:00
|
|
|
|
|
|
|
|
|
va_start (args, ctlstr);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
ret = defaulted_query (ctlstr, '\0', args);
|
2006-10-19 06:16:52 +08:00
|
|
|
|
va_end (args);
|
2011-03-01 06:20:05 +08:00
|
|
|
|
return ret;
|
2006-10-19 06:16:52 +08:00
|
|
|
|
}
|
|
|
|
|
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
/* A helper for parse_escape that converts a host character to a
|
|
|
|
|
target character. C is the host character. If conversion is
|
|
|
|
|
possible, then the target character is stored in *TARGET_C and the
|
|
|
|
|
function returns 1. Otherwise, the function returns 0. */
|
|
|
|
|
|
|
|
|
|
static int
|
2010-03-06 04:18:19 +08:00
|
|
|
|
host_char_to_target (struct gdbarch *gdbarch, int c, int *target_c)
|
2002-09-20 08:24:01 +08:00
|
|
|
|
{
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
struct obstack host_data;
|
|
|
|
|
char the_char = c;
|
|
|
|
|
struct cleanup *cleanups;
|
|
|
|
|
int result = 0;
|
2002-09-20 08:24:01 +08:00
|
|
|
|
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
obstack_init (&host_data);
|
|
|
|
|
cleanups = make_cleanup_obstack_free (&host_data);
|
2002-09-20 08:24:01 +08:00
|
|
|
|
|
2010-03-06 04:18:19 +08:00
|
|
|
|
convert_between_encodings (target_charset (gdbarch), host_charset (),
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
&the_char, 1, 1, &host_data, translit_none);
|
|
|
|
|
|
|
|
|
|
if (obstack_object_size (&host_data) == 1)
|
|
|
|
|
{
|
|
|
|
|
result = 1;
|
|
|
|
|
*target_c = *(char *) obstack_base (&host_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_cleanups (cleanups);
|
|
|
|
|
return result;
|
2002-09-20 08:24:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Parse a C escape sequence. STRING_PTR points to a variable
|
|
|
|
|
containing a pointer to the string to parse. That pointer
|
|
|
|
|
should point to the character after the \. That pointer
|
|
|
|
|
is updated past the characters we use. The value of the
|
|
|
|
|
escape sequence is returned.
|
|
|
|
|
|
|
|
|
|
A negative value means the sequence \ newline was seen,
|
|
|
|
|
which is supposed to be equivalent to nothing at all.
|
|
|
|
|
|
|
|
|
|
If \ is followed by a null character, we return a negative
|
|
|
|
|
value and leave the string pointer pointing at the null character.
|
|
|
|
|
|
|
|
|
|
If \ is followed by 000, we return 0 and leave the string pointer
|
|
|
|
|
after the zeros. A value of 0 does not mean end of string. */
|
|
|
|
|
|
|
|
|
|
int
|
2010-03-06 04:18:19 +08:00
|
|
|
|
parse_escape (struct gdbarch *gdbarch, char **string_ptr)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2011-01-12 09:23:29 +08:00
|
|
|
|
int target_char = -2; /* Initialize to avoid GCC warnings. */
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-15 00:32:14 +08:00
|
|
|
|
int c = *(*string_ptr)++;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
2003-02-01 06:45:22 +08:00
|
|
|
|
case '\n':
|
|
|
|
|
return -2;
|
|
|
|
|
case 0:
|
|
|
|
|
(*string_ptr)--;
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case '0':
|
|
|
|
|
case '1':
|
|
|
|
|
case '2':
|
|
|
|
|
case '3':
|
|
|
|
|
case '4':
|
|
|
|
|
case '5':
|
|
|
|
|
case '6':
|
|
|
|
|
case '7':
|
|
|
|
|
{
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
int i = host_hex_value (c);
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-17 02:56:35 +08:00
|
|
|
|
int count = 0;
|
2003-02-01 06:45:22 +08:00
|
|
|
|
while (++count < 3)
|
|
|
|
|
{
|
2003-02-07 08:27:31 +08:00
|
|
|
|
c = (**string_ptr);
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
if (isdigit (c) && c != '8' && c != '9')
|
2003-02-01 06:45:22 +08:00
|
|
|
|
{
|
2003-02-07 08:27:31 +08:00
|
|
|
|
(*string_ptr)++;
|
2003-02-01 06:45:22 +08:00
|
|
|
|
i *= 8;
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
i += host_hex_value (c);
|
2003-02-01 06:45:22 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return i;
|
|
|
|
|
}
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
|
|
|
|
|
case 'a':
|
|
|
|
|
c = '\a';
|
|
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
c = '\b';
|
|
|
|
|
break;
|
|
|
|
|
case 'f':
|
|
|
|
|
c = '\f';
|
|
|
|
|
break;
|
|
|
|
|
case 'n':
|
|
|
|
|
c = '\n';
|
|
|
|
|
break;
|
|
|
|
|
case 'r':
|
|
|
|
|
c = '\r';
|
|
|
|
|
break;
|
|
|
|
|
case 't':
|
|
|
|
|
c = '\t';
|
|
|
|
|
break;
|
|
|
|
|
case 'v':
|
|
|
|
|
c = '\v';
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-06 04:18:19 +08:00
|
|
|
|
if (!host_char_to_target (gdbarch, c, &target_char))
|
2011-03-03 11:51:30 +08:00
|
|
|
|
error (_("The escape sequence `\\%c' is equivalent to plain `%c',"
|
|
|
|
|
" which has no equivalent\nin the `%s' character set."),
|
2011-03-03 06:11:27 +08:00
|
|
|
|
c, c, target_charset (gdbarch));
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 07:04:40 +08:00
|
|
|
|
return target_char;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
of the program being debugged. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-12 19:15:22 +08:00
|
|
|
|
static void
|
2000-11-04 08:46:46 +08:00
|
|
|
|
printchar (int c, void (*do_fputs) (const char *, struct ui_file *),
|
From Kaveh R. Ghazi <ghazi@caip.rutgers.edu>:
gdb/
* cli-out.c (cli_field_fmt, cli_message, out_field_fmt): Add
ATTR_FORMAT or ATTRIBUTE_FPTR_PRINTF.
* complaints.c (vcomplaint): Likewise.
* defs.h (xvasprintf, xstrvprintf, verror, vfatal)
(internal_verror, internal_vwarning, vwarning)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_readline_begin_hook): Likewise.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (throw_verror, throw_vfatal): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* tui/tui-out.c (tui_field_fmt, tui_message, out_field_fmt):
Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message, field_fmt_ftype)
(message_ftype): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem)
(defaulted_query, printchar): Likewise.
gdb/gdbserver/
* server.h (error, fatal, warning): Add ATTR_FORMAT.
2005-08-01 04:56:26 +08:00
|
|
|
|
void (*do_fprintf) (struct ui_file *, const char *, ...)
|
|
|
|
|
ATTRIBUTE_FPTR_PRINTF_2, struct ui_file *stream, int quoter)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
c &= 0xFF; /* Avoid sign bit follies */
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
if (c < 0x20 || /* Low control chars */
|
|
|
|
|
(c >= 0x7F && c < 0xA0) || /* DEL, High controls */
|
|
|
|
|
(sevenbit_strings && c >= 0x80))
|
|
|
|
|
{ /* high order bit set */
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case '\n':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\n", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\b':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\b", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\t':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\t", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\f':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\f", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\r':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\r", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\033':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\e", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case '\007':
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\a", stream);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fprintf (stream, "\\%.3o", (unsigned int) c);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (c == '\\' || c == quoter)
|
1999-07-12 19:15:22 +08:00
|
|
|
|
do_fputs ("\\", stream);
|
|
|
|
|
do_fprintf (stream, "%c", c);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
1999-07-12 19:15:22 +08:00
|
|
|
|
|
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
the language of the program being debugged. */
|
1999-07-12 19:15:22 +08:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputstr_filtered (const char *str, int quoter, struct ui_file *stream)
|
1999-07-12 19:15:22 +08:00
|
|
|
|
{
|
|
|
|
|
while (*str)
|
|
|
|
|
printchar (*str++, fputs_filtered, fprintf_filtered, stream, quoter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputstr_unfiltered (const char *str, int quoter, struct ui_file *stream)
|
1999-07-12 19:15:22 +08:00
|
|
|
|
{
|
|
|
|
|
while (*str)
|
|
|
|
|
printchar (*str++, fputs_unfiltered, fprintf_unfiltered, stream, quoter);
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-13 02:50:18 +08:00
|
|
|
|
void
|
|
|
|
|
fputstrn_filtered (const char *str, int n, int quoter,
|
|
|
|
|
struct ui_file *stream)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2006-07-13 02:50:18 +08:00
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
|
printchar (str[i], fputs_filtered, fprintf_filtered, stream, quoter);
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-12 19:15:22 +08:00
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
fputstrn_unfiltered (const char *str, int n, int quoter,
|
|
|
|
|
struct ui_file *stream)
|
1999-07-12 19:15:22 +08:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
1999-07-12 19:15:22 +08:00
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
|
printchar (str[i], fputs_unfiltered, fprintf_unfiltered, stream, quoter);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Number of lines per page or UINT_MAX if paging is disabled. */
|
|
|
|
|
static unsigned int lines_per_page;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_lines_per_page (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
2011-01-06 06:22:53 +08:00
|
|
|
|
fprintf_filtered (file,
|
|
|
|
|
_("Number of lines gdb thinks are in a page is %s.\n"),
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
value);
|
|
|
|
|
}
|
2003-08-23 04:23:15 +08:00
|
|
|
|
|
2000-06-16 04:40:29 +08:00
|
|
|
|
/* Number of chars per line or UINT_MAX if line folding is disabled. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
static unsigned int chars_per_line;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_chars_per_line (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
2011-01-06 06:22:53 +08:00
|
|
|
|
fprintf_filtered (file,
|
|
|
|
|
_("Number of characters gdb thinks "
|
|
|
|
|
"are in a line is %s.\n"),
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
value);
|
|
|
|
|
}
|
2003-08-23 04:23:15 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Current count of lines printed on this page, chars on this line. */
|
|
|
|
|
static unsigned int lines_printed, chars_printed;
|
|
|
|
|
|
|
|
|
|
/* Buffer and start column of buffered text, for doing smarter word-
|
|
|
|
|
wrapping. When someone calls wrap_here(), we start buffering output
|
|
|
|
|
that comes through fputs_filtered(). If we see a newline, we just
|
|
|
|
|
spit it out and forget about the wrap_here(). If we see another
|
|
|
|
|
wrap_here(), we spit it out and remember the newer one. If we see
|
|
|
|
|
the end of the line, we spit out a newline, the indent, and then
|
|
|
|
|
the buffered output. */
|
|
|
|
|
|
|
|
|
|
/* Malloc'd buffer with chars_per_line+2 bytes. Contains characters which
|
|
|
|
|
are waiting to be output (they have already been counted in chars_printed).
|
|
|
|
|
When wrap_buffer[0] is null, the buffer is empty. */
|
|
|
|
|
static char *wrap_buffer;
|
|
|
|
|
|
|
|
|
|
/* Pointer in wrap_buffer to the next character to fill. */
|
|
|
|
|
static char *wrap_pointer;
|
|
|
|
|
|
|
|
|
|
/* String to indent by if the wrap occurs. Must not be NULL if wrap_column
|
|
|
|
|
is non-zero. */
|
|
|
|
|
static char *wrap_indent;
|
|
|
|
|
|
|
|
|
|
/* Column number on the screen where wrap_buffer begins, or 0 if wrapping
|
|
|
|
|
is not in effect. */
|
|
|
|
|
static int wrap_column;
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* Inialize the number of lines per page and chars per line. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
init_page_info (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2010-08-07 23:00:39 +08:00
|
|
|
|
if (batch_flag)
|
|
|
|
|
{
|
|
|
|
|
lines_per_page = UINT_MAX;
|
|
|
|
|
chars_per_line = UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
else
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#if defined(TUI)
|
2001-07-22 06:31:14 +08:00
|
|
|
|
if (!tui_get_command_dimension (&chars_per_line, &lines_per_page))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#endif
|
|
|
|
|
{
|
2003-08-23 04:23:15 +08:00
|
|
|
|
int rows, cols;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2004-01-22 02:46:23 +08:00
|
|
|
|
#if defined(__GO32__)
|
|
|
|
|
rows = ScreenRows ();
|
|
|
|
|
cols = ScreenCols ();
|
|
|
|
|
lines_per_page = rows;
|
|
|
|
|
chars_per_line = cols;
|
|
|
|
|
#else
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* Make sure Readline has initialized its terminal settings. */
|
|
|
|
|
rl_reset_terminal (NULL);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* Get the screen size from Readline. */
|
|
|
|
|
rl_get_screen_size (&rows, &cols);
|
|
|
|
|
lines_per_page = rows;
|
|
|
|
|
chars_per_line = cols;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* Readline should have fetched the termcap entry for us. */
|
|
|
|
|
if (tgetnum ("li") < 0 || 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. */
|
|
|
|
|
lines_per_page = UINT_MAX;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* FIXME: Get rid of this junk. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER)
|
|
|
|
|
SIGWINCH_HANDLER (SIGWINCH);
|
|
|
|
|
#endif
|
2003-08-23 04:23:15 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* If the output is not a terminal, don't paginate it. */
|
2000-02-02 08:21:19 +08:00
|
|
|
|
if (!ui_file_isatty (gdb_stdout))
|
1999-07-08 04:19:36 +08:00
|
|
|
|
lines_per_page = UINT_MAX;
|
2003-08-23 04:23:15 +08:00
|
|
|
|
#endif
|
2004-01-22 02:46:23 +08:00
|
|
|
|
}
|
2003-08-23 04:23:15 +08:00
|
|
|
|
|
|
|
|
|
set_screen_size ();
|
1999-07-08 04:19:36 +08:00
|
|
|
|
set_width ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2010-08-07 23:00:39 +08:00
|
|
|
|
/* 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;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
/* Set the screen size based on LINES_PER_PAGE and CHARS_PER_LINE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_screen_size (void)
|
|
|
|
|
{
|
|
|
|
|
int rows = lines_per_page;
|
|
|
|
|
int cols = chars_per_line;
|
|
|
|
|
|
|
|
|
|
if (rows <= 0)
|
|
|
|
|
rows = INT_MAX;
|
|
|
|
|
|
|
|
|
|
if (cols <= 0)
|
2007-06-14 01:08:34 +08:00
|
|
|
|
cols = INT_MAX;
|
2003-08-23 04:23:15 +08:00
|
|
|
|
|
|
|
|
|
/* Update Readline's idea of the terminal size. */
|
|
|
|
|
rl_set_screen_size (rows, cols);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reinitialize WRAP_BUFFER according to the current value of
|
|
|
|
|
CHARS_PER_LINE. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
set_width (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (chars_per_line == 0)
|
1999-07-08 04:19:36 +08:00
|
|
|
|
init_page_info ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (!wrap_buffer)
|
|
|
|
|
{
|
|
|
|
|
wrap_buffer = (char *) xmalloc (chars_per_line + 2);
|
|
|
|
|
wrap_buffer[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
wrap_buffer = (char *) xrealloc (wrap_buffer, chars_per_line + 2);
|
2003-08-23 04:23:15 +08:00
|
|
|
|
wrap_pointer = wrap_buffer; /* Start it at the beginning. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
set_width_command (char *args, int from_tty, struct cmd_list_element *c)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-08-23 04:23:15 +08:00
|
|
|
|
set_screen_size ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
set_width ();
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-23 04:23:15 +08:00
|
|
|
|
static void
|
|
|
|
|
set_height_command (char *args, int from_tty, struct cmd_list_element *c)
|
|
|
|
|
{
|
|
|
|
|
set_screen_size ();
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Wait, so the user can read what's on the screen. Prompt the user
|
|
|
|
|
to continue by pressing RETURN. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
prompt_for_continue (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *ignore;
|
|
|
|
|
char cont_prompt[120];
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* 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);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (annotation_level > 1)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_unfiltered (("\n\032\032pre-prompt-for-continue\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
strcpy (cont_prompt,
|
|
|
|
|
"---Type <return> to continue, or q <return> to quit---");
|
|
|
|
|
if (annotation_level > 1)
|
|
|
|
|
strcat (cont_prompt, "\n\032\032prompt-for-continue\n");
|
|
|
|
|
|
|
|
|
|
/* We must do this *before* we call gdb_readline, else it will eventually
|
|
|
|
|
call us -- thinking that we're trying to print beyond the end of the
|
|
|
|
|
screen. */
|
|
|
|
|
reinitialize_more_filter ();
|
|
|
|
|
|
|
|
|
|
immediate_quit++;
|
|
|
|
|
/* On a real operating system, the user can quit with SIGINT.
|
|
|
|
|
But not on GO32.
|
|
|
|
|
|
|
|
|
|
'q' is provided on all systems so users don't have to change habits
|
|
|
|
|
from system to system, and because telling them what to do in
|
|
|
|
|
the prompt is more user-friendly than expecting them to think of
|
|
|
|
|
SIGINT. */
|
|
|
|
|
/* Call readline, not gdb_readline, because GO32 readline handles control-C
|
|
|
|
|
whereas control-C to gdb_readline will cause the user to get dumped
|
|
|
|
|
out to DOS. */
|
2002-07-25 01:58:46 +08:00
|
|
|
|
ignore = gdb_readline_wrapper (cont_prompt);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2012-08-09 05:55:01 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (annotation_level > 1)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_unfiltered (("\n\032\032post-prompt-for-continue\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (ignore)
|
|
|
|
|
{
|
|
|
|
|
char *p = ignore;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
++p;
|
|
|
|
|
if (p[0] == 'q')
|
2004-09-13 Andrew Cagney <cagney@gnu.org>
Eliminate event_loop_p, always has the value 1.
* defs.h (event_loop_p): Delete macro.
* breakpoint.c (until_break_command): Simplify.
* utils.c (prompt_for_continue): Simplify.
* tracepoint.c (read_actions): Simplify.
* top.c (throw_exception, execute_command, gdb_readline_wrapper)
(gdb_rl_operate_and_get_next, command_line_input, get_prompt)
(set_prompt, init_main): Simplify.
(init_signals, disconnect): Delete, unused.
* remote.c (remote_async_resume)
(extended_remote_async_create_inferior): Simplify.
* mi/mi-interp.c (mi_input): Delete, unused.
(mi_interpreter_resume, mi_command_loop): Simplify.
* interps.c (current_interp_command_loop): Simplify.
* infrun.c (proceed): Simplify.
* infcmd.c (run_command, continue_command, step_1, jump_command)
(until_command, advance_command, finish_command)
(interrupt_target_command): Simplify.
* event-top.c (gdb_setup_readline, gdb_disable_readline): Simplify.
2004-09-14 02:26:31 +08:00
|
|
|
|
async_request_quit (0);
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (ignore);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
immediate_quit--;
|
|
|
|
|
|
|
|
|
|
/* Now we have to do this again, so that GDB will know that it doesn't
|
|
|
|
|
need to save the ---Type <return>--- line at the top of the screen. */
|
|
|
|
|
reinitialize_more_filter ();
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
dont_repeat (); /* Forget prev cmd -- CR won't repeat it. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reinitialize filter; ie. tell it to reset to original values. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
reinitialize_more_filter (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
lines_printed = 0;
|
|
|
|
|
chars_printed = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Indicate that if the next sequence of characters overflows the line,
|
2011-01-12 09:23:29 +08:00
|
|
|
|
a newline should be inserted here rather than when it hits the end.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
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
|
|
|
|
|
fputs_filtered().
|
|
|
|
|
|
|
|
|
|
If the line is already overfull, we immediately print a newline and
|
|
|
|
|
the indentation, and disable further wrapping.
|
|
|
|
|
|
|
|
|
|
If we don't know the width of lines, but we know the page height,
|
|
|
|
|
we must not wrap words, but should still keep track of newlines
|
|
|
|
|
that were explicitly printed.
|
|
|
|
|
|
|
|
|
|
INDENT should not contain tabs, as that will mess up the char count
|
|
|
|
|
on the next line. FIXME.
|
|
|
|
|
|
|
|
|
|
This routine is guaranteed to force out any output which has been
|
|
|
|
|
squirreled away in the wrap_buffer, so wrap_here ((char *)0) can be
|
|
|
|
|
used to force out output from the wrap_buffer. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
wrap_here (char *indent)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* This should have been allocated, but be paranoid anyway. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (!wrap_buffer)
|
2011-01-06 06:22:53 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
_("failed internal consistency check"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (wrap_buffer[0])
|
|
|
|
|
{
|
|
|
|
|
*wrap_pointer = '\0';
|
|
|
|
|
fputs_unfiltered (wrap_buffer, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
wrap_pointer = wrap_buffer;
|
|
|
|
|
wrap_buffer[0] = '\0';
|
2011-01-06 06:22:53 +08:00
|
|
|
|
if (chars_per_line == UINT_MAX) /* No line overflow checking. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
wrap_column = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (chars_printed >= chars_per_line)
|
|
|
|
|
{
|
|
|
|
|
puts_filtered ("\n");
|
|
|
|
|
if (indent != NULL)
|
|
|
|
|
puts_filtered (indent);
|
|
|
|
|
wrap_column = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
wrap_column = chars_printed;
|
|
|
|
|
if (indent == NULL)
|
|
|
|
|
wrap_indent = "";
|
|
|
|
|
else
|
|
|
|
|
wrap_indent = indent;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-15 10:16:51 +08:00
|
|
|
|
/* Print input string to gdb_stdout, filtered, with wrap,
|
2011-01-12 09:23:29 +08:00
|
|
|
|
arranging strings in columns of n chars. String can be
|
2002-10-15 10:16:51 +08:00
|
|
|
|
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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
command, which currently doesn't tabulate very well. */
|
2002-10-15 10:16:51 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
puts_filtered_tabular (char *string, int width, int right)
|
|
|
|
|
{
|
|
|
|
|
int spaces = 0;
|
|
|
|
|
int stringlen;
|
|
|
|
|
char *spacebuf;
|
|
|
|
|
|
|
|
|
|
gdb_assert (chars_per_line > 0);
|
|
|
|
|
if (chars_per_line == UINT_MAX)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (string, gdb_stdout);
|
|
|
|
|
fputs_filtered ("\n", gdb_stdout);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (((chars_printed - 1) / width + 2) * width >= chars_per_line)
|
|
|
|
|
fputs_filtered ("\n", gdb_stdout);
|
|
|
|
|
|
|
|
|
|
if (width >= chars_per_line)
|
|
|
|
|
width = chars_per_line - 1;
|
|
|
|
|
|
|
|
|
|
stringlen = strlen (string);
|
|
|
|
|
|
|
|
|
|
if (chars_printed > 0)
|
|
|
|
|
spaces = width - (chars_printed - 1) % width - 1;
|
|
|
|
|
if (right)
|
|
|
|
|
spaces += width - stringlen;
|
|
|
|
|
|
|
|
|
|
spacebuf = alloca (spaces + 1);
|
|
|
|
|
spacebuf[spaces] = '\0';
|
|
|
|
|
while (spaces--)
|
|
|
|
|
spacebuf[spaces] = ' ';
|
|
|
|
|
|
|
|
|
|
fputs_filtered (spacebuf, gdb_stdout);
|
|
|
|
|
fputs_filtered (string, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Ensure that whatever gets printed next, using the filtered output
|
2011-01-12 09:23:29 +08:00
|
|
|
|
commands, starts at the beginning of the line. I.e. if there is
|
1999-04-16 09:35:26 +08:00
|
|
|
|
any pending output for the current line, flush it and start a new
|
2011-01-12 09:23:29 +08:00
|
|
|
|
line. Otherwise do nothing. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
begin_line (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (chars_printed > 0)
|
|
|
|
|
{
|
|
|
|
|
puts_filtered ("\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-06-01 23:44:41 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Like fputs but if FILTER is true, pause after every screenful.
|
|
|
|
|
|
|
|
|
|
Regardless of FILTER can wrap at points other than the final
|
|
|
|
|
character of a line.
|
|
|
|
|
|
|
|
|
|
Unlike fputs, fputs_maybe_filtered does not return a value.
|
|
|
|
|
It is OK for LINEBUFFER to be NULL, in which case just don't print
|
|
|
|
|
anything.
|
|
|
|
|
|
|
|
|
|
Note that a longjmp to top level may occur in this routine (only if
|
|
|
|
|
FILTER is true) (since prompt_for_continue may do so) so this
|
|
|
|
|
routine should not be called when cleanups are not in place. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream,
|
|
|
|
|
int filter)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
const char *lineptr;
|
|
|
|
|
|
|
|
|
|
if (linebuffer == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Don't do any filtering if it is disabled. */
|
2010-03-04 09:06:28 +08:00
|
|
|
|
if (stream != gdb_stdout
|
2011-09-08 23:27:46 +08:00
|
|
|
|
|| !pagination_enabled
|
|
|
|
|
|| batch_flag
|
2010-03-04 09:06:28 +08:00
|
|
|
|
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)
|
2010-03-04 22:58:40 +08:00
|
|
|
|
|| top_level_interpreter () == NULL
|
2010-03-04 09:06:28 +08:00
|
|
|
|
|| ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ())))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
fputs_unfiltered (linebuffer, stream);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Go through and output each character. Show line extension
|
|
|
|
|
when this is necessary; prompt user for new page when this is
|
|
|
|
|
necessary. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
lineptr = linebuffer;
|
|
|
|
|
while (*lineptr)
|
|
|
|
|
{
|
|
|
|
|
/* Possible new page. */
|
2003-02-01 06:45:22 +08:00
|
|
|
|
if (filter && (lines_printed >= lines_per_page - 1))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
prompt_for_continue ();
|
|
|
|
|
|
|
|
|
|
while (*lineptr && *lineptr != '\n')
|
|
|
|
|
{
|
|
|
|
|
/* Print a single line. */
|
|
|
|
|
if (*lineptr == '\t')
|
|
|
|
|
{
|
|
|
|
|
if (wrap_column)
|
|
|
|
|
*wrap_pointer++ = '\t';
|
|
|
|
|
else
|
|
|
|
|
fputc_unfiltered ('\t', stream);
|
|
|
|
|
/* Shifting right by 3 produces the number of tab stops
|
|
|
|
|
we have already passed, and then adding one and
|
1999-07-08 04:19:36 +08:00
|
|
|
|
shifting left 3 advances to the next tab stop. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
chars_printed = ((chars_printed >> 3) + 1) << 3;
|
|
|
|
|
lineptr++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (wrap_column)
|
|
|
|
|
*wrap_pointer++ = *lineptr;
|
|
|
|
|
else
|
1999-07-08 04:19:36 +08:00
|
|
|
|
fputc_unfiltered (*lineptr, stream);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
chars_printed++;
|
|
|
|
|
lineptr++;
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (chars_printed >= chars_per_line)
|
|
|
|
|
{
|
|
|
|
|
unsigned int save_chars = chars_printed;
|
|
|
|
|
|
|
|
|
|
chars_printed = 0;
|
|
|
|
|
lines_printed++;
|
|
|
|
|
/* If we aren't actually wrapping, don't output newline --
|
1999-07-08 04:19:36 +08:00
|
|
|
|
if chars_per_line is right, we probably just overflowed
|
|
|
|
|
anyway; if it's wrong, let us keep going. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (wrap_column)
|
|
|
|
|
fputc_unfiltered ('\n', stream);
|
|
|
|
|
|
|
|
|
|
/* Possible new page. */
|
|
|
|
|
if (lines_printed >= lines_per_page - 1)
|
|
|
|
|
prompt_for_continue ();
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Now output indentation and wrapped string. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (wrap_column)
|
|
|
|
|
{
|
|
|
|
|
fputs_unfiltered (wrap_indent, stream);
|
2011-01-12 09:23:29 +08:00
|
|
|
|
*wrap_pointer = '\0'; /* Null-terminate saved stuff, */
|
|
|
|
|
fputs_unfiltered (wrap_buffer, stream); /* and eject it. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
longer than (the user settable) chars_per_line.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
Note also that this can set chars_printed > chars_per_line
|
|
|
|
|
if we are printing a long string. */
|
|
|
|
|
chars_printed = strlen (wrap_indent)
|
1999-07-08 04:19:36 +08:00
|
|
|
|
+ (save_chars - wrap_column);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
wrap_pointer = wrap_buffer; /* Reset buffer */
|
|
|
|
|
wrap_buffer[0] = '\0';
|
1999-07-08 04:19:36 +08:00
|
|
|
|
wrap_column = 0; /* And disable fancy wrap */
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*lineptr == '\n')
|
|
|
|
|
{
|
|
|
|
|
chars_printed = 0;
|
2011-01-06 06:22:53 +08:00
|
|
|
|
wrap_here ((char *) 0); /* Spit out chars, cancel
|
|
|
|
|
further wraps. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
lines_printed++;
|
|
|
|
|
fputc_unfiltered ('\n', stream);
|
|
|
|
|
lineptr++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputs_filtered (const char *linebuffer, struct ui_file *stream)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
fputs_maybe_filtered (linebuffer, stream, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
putchar_unfiltered (int c)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-11-09 09:23:30 +08:00
|
|
|
|
char buf = c;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2000-02-02 08:21:19 +08:00
|
|
|
|
ui_file_write (gdb_stdout, &buf, 1);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
2001-01-31 11:46:23 +08:00
|
|
|
|
/* Write character C to gdb_stdout using GDB's paging mechanism and return C.
|
|
|
|
|
May return nonlocally. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
putchar_filtered (int c)
|
|
|
|
|
{
|
|
|
|
|
return fputc_filtered (c, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputc_unfiltered (int c, struct ui_file *stream)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-11-09 09:23:30 +08:00
|
|
|
|
char buf = c;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2000-02-02 08:21:19 +08:00
|
|
|
|
ui_file_write (stream, &buf, 1);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fputc_filtered (int c, struct ui_file *stream)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char buf[2];
|
|
|
|
|
|
|
|
|
|
buf[0] = c;
|
|
|
|
|
buf[1] = 0;
|
|
|
|
|
fputs_filtered (buf, stream);
|
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* puts_debug is like fputs_unfiltered, except it prints special
|
|
|
|
|
characters in printable fashion. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
puts_debug (char *prefix, char *string, char *suffix)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
int ch;
|
|
|
|
|
|
|
|
|
|
/* Print prefix and suffix after each line. */
|
|
|
|
|
static int new_line = 1;
|
|
|
|
|
static int return_p = 0;
|
|
|
|
|
static char *prev_prefix = "";
|
|
|
|
|
static char *prev_suffix = "";
|
|
|
|
|
|
|
|
|
|
if (*string == '\n')
|
|
|
|
|
return_p = 0;
|
|
|
|
|
|
|
|
|
|
/* If the prefix is changing, print the previous suffix, a new line,
|
|
|
|
|
and the new prefix. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
if ((return_p || (strcmp (prev_prefix, prefix) != 0)) && !new_line)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-07-08 01:31:57 +08:00
|
|
|
|
fputs_unfiltered (prev_suffix, gdb_stdlog);
|
|
|
|
|
fputs_unfiltered ("\n", gdb_stdlog);
|
|
|
|
|
fputs_unfiltered (prefix, gdb_stdlog);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print prefix if we printed a newline during the previous call. */
|
|
|
|
|
if (new_line)
|
|
|
|
|
{
|
|
|
|
|
new_line = 0;
|
1999-07-08 01:31:57 +08:00
|
|
|
|
fputs_unfiltered (prefix, gdb_stdlog);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prev_prefix = prefix;
|
|
|
|
|
prev_suffix = suffix;
|
|
|
|
|
|
|
|
|
|
/* Output characters in a printable format. */
|
|
|
|
|
while ((ch = *string++) != '\0')
|
|
|
|
|
{
|
|
|
|
|
switch (ch)
|
1999-07-08 04:19:36 +08:00
|
|
|
|
{
|
1999-04-16 09:35:26 +08:00
|
|
|
|
default:
|
|
|
|
|
if (isprint (ch))
|
1999-07-08 01:31:57 +08:00
|
|
|
|
fputc_unfiltered (ch, gdb_stdlog);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
else
|
1999-07-08 01:31:57 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "\\x%02x", ch & 0xff);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
break;
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
case '\\':
|
|
|
|
|
fputs_unfiltered ("\\\\", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\b':
|
|
|
|
|
fputs_unfiltered ("\\b", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\f':
|
|
|
|
|
fputs_unfiltered ("\\f", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\n':
|
|
|
|
|
new_line = 1;
|
|
|
|
|
fputs_unfiltered ("\\n", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\r':
|
|
|
|
|
fputs_unfiltered ("\\r", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\t':
|
|
|
|
|
fputs_unfiltered ("\\t", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
case '\v':
|
|
|
|
|
fputs_unfiltered ("\\v", gdb_stdlog);
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
return_p = ch == '\r';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print suffix if we printed a newline. */
|
|
|
|
|
if (new_line)
|
|
|
|
|
{
|
1999-07-08 01:31:57 +08:00
|
|
|
|
fputs_unfiltered (suffix, gdb_stdlog);
|
|
|
|
|
fputs_unfiltered ("\n", gdb_stdlog);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Print a variable number of ARGS using format FORMAT. If this
|
|
|
|
|
information is going to put the amount written (since the last call
|
|
|
|
|
to REINITIALIZE_MORE_FILTER or the last page break) over the page size,
|
|
|
|
|
call prompt_for_continue to get the users permision to continue.
|
|
|
|
|
|
|
|
|
|
Unlike fprintf, this function does not return a value.
|
|
|
|
|
|
|
|
|
|
We implement three variants, vfprintf (takes a vararg list and stream),
|
|
|
|
|
fprintf (takes a stream to write on), and printf (the usual).
|
|
|
|
|
|
|
|
|
|
Note also that a longjmp to top level may occur in this routine
|
|
|
|
|
(since prompt_for_continue may do so) so this routine should not be
|
|
|
|
|
called when cleanups are not in place. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
vfprintf_maybe_filtered (struct ui_file *stream, const char *format,
|
|
|
|
|
va_list args, int filter)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *linebuffer;
|
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
|
|
2004-06-29 22:57:39 +08:00
|
|
|
|
linebuffer = xstrvprintf (format, args);
|
2000-12-15 09:01:51 +08:00
|
|
|
|
old_cleanups = make_cleanup (xfree, linebuffer);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
fputs_maybe_filtered (linebuffer, stream, filter);
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
vfprintf_filtered (struct ui_file *stream, const char *format, va_list args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
vfprintf_maybe_filtered (stream, format, args, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
vfprintf_unfiltered (struct ui_file *stream, const char *format, va_list args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *linebuffer;
|
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
|
|
2004-06-29 22:57:39 +08:00
|
|
|
|
linebuffer = xstrvprintf (format, args);
|
2000-12-15 09:01:51 +08:00
|
|
|
|
old_cleanups = make_cleanup (xfree, linebuffer);
|
2008-02-28 04:50:49 +08:00
|
|
|
|
if (debug_timestamp && stream == gdb_stdlog)
|
|
|
|
|
{
|
|
|
|
|
struct timeval tm;
|
|
|
|
|
char *timestamp;
|
2008-11-19 22:45:09 +08:00
|
|
|
|
int len, need_nl;
|
2008-02-28 04:50:49 +08:00
|
|
|
|
|
|
|
|
|
gettimeofday (&tm, NULL);
|
2008-11-19 22:45:09 +08:00
|
|
|
|
|
|
|
|
|
len = strlen (linebuffer);
|
|
|
|
|
need_nl = (len > 0 && linebuffer[len - 1] != '\n');
|
|
|
|
|
|
|
|
|
|
timestamp = xstrprintf ("%ld:%ld %s%s",
|
|
|
|
|
(long) tm.tv_sec, (long) tm.tv_usec,
|
|
|
|
|
linebuffer,
|
|
|
|
|
need_nl ? "\n": "");
|
2008-02-28 04:50:49 +08:00
|
|
|
|
make_cleanup (xfree, timestamp);
|
|
|
|
|
fputs_unfiltered (timestamp, stream);
|
|
|
|
|
}
|
2008-11-19 22:45:09 +08:00
|
|
|
|
else
|
|
|
|
|
fputs_unfiltered (linebuffer, stream);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
vprintf_filtered (const char *format, va_list args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
vfprintf_maybe_filtered (gdb_stdout, format, args, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
vprintf_unfiltered (const char *format, va_list args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
vfprintf_unfiltered (gdb_stdout, format, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
fprintf_filtered (struct ui_file *stream, const char *format, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
fprintf_unfiltered (struct ui_file *stream, const char *format, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
vfprintf_unfiltered (stream, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like fprintf_filtered, but prints its result indented.
|
|
|
|
|
Called as fprintfi_filtered (spaces, stream, format, ...); */
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
fprintfi_filtered (int spaces, struct ui_file *stream, const char *format,
|
|
|
|
|
...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
print_spaces_filtered (spaces, stream);
|
|
|
|
|
|
|
|
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
printf_filtered (const char *format, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
vfprintf_filtered (gdb_stdout, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
printf_unfiltered (const char *format, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
vfprintf_unfiltered (gdb_stdout, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like printf_filtered, but prints it's result indented.
|
|
|
|
|
Called as printfi_filtered (spaces, format, ...); */
|
|
|
|
|
|
|
|
|
|
void
|
2003-02-01 06:45:22 +08:00
|
|
|
|
printfi_filtered (int spaces, const char *format, ...)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
va_list args;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
va_start (args, format);
|
|
|
|
|
print_spaces_filtered (spaces, gdb_stdout);
|
|
|
|
|
vfprintf_filtered (gdb_stdout, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Easy -- but watch out!
|
|
|
|
|
|
|
|
|
|
This routine is *not* a replacement for puts()! puts() appends a newline.
|
|
|
|
|
This one doesn't, and had better not! */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
puts_filtered (const char *string)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
fputs_filtered (string, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
puts_unfiltered (const char *string)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
fputs_unfiltered (string, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a pointer to N spaces and a null. The pointer is good
|
|
|
|
|
until the next call to here. */
|
|
|
|
|
char *
|
2000-07-30 09:48:28 +08:00
|
|
|
|
n_spaces (int n)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-05-26 02:09:09 +08:00
|
|
|
|
char *t;
|
|
|
|
|
static char *spaces = 0;
|
|
|
|
|
static int max_spaces = -1;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (n > max_spaces)
|
|
|
|
|
{
|
|
|
|
|
if (spaces)
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (spaces);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
spaces = (char *) xmalloc (n + 1);
|
|
|
|
|
for (t = spaces + n; t != spaces;)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
*--t = ' ';
|
|
|
|
|
spaces[n] = '\0';
|
|
|
|
|
max_spaces = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return spaces + max_spaces - n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print N spaces. */
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
print_spaces_filtered (int n, struct ui_file *stream)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
fputs_filtered (n_spaces (n), stream);
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-15 10:16:51 +08:00
|
|
|
|
/* C++/ObjC demangler stuff. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-09-19 11:58:41 +08:00
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
demangling is off, the name is printed in its "raw" form. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
* gdbtypes.h (struct main_type): Change type of name,tag_name,
and fields.name members from char * to const char *. All uses updated.
(struct cplus_struct_type): Change type of fn_fieldlists.name member
from char * to const char *. All uses updated.
(type_name_no_tag): Update.
(lookup_unsigned_typename, lookup_signed_typename): Update.
* gdbtypes.c (type_name_no_tag): Change result type
from char * to const char *. All callers updated.
(lookup_unsigned_typename, lookup_signed_typename): Change type of
name parameter from char * to const char *.
* symtab.h (struct cplus_specific): Change type of demangled_name
member from char * to const char *. All uses updated.
(struct general_symbol_info): Change type of name and
mangled_lang.demangled_name members from char * to const char *.
All uses updated.
(symbol_get_demangled_name, symbol_natural_name): Update.
(symbol_demangled_name, symbol_search_name): Update.
* symtab.c (symbol_get_demangled_name): Change result type
from char * to const char *. All callers updated.
(symbol_natural_name, symbol_demangled_name): Ditto.
(symbol_search_name): Ditto.
(completion_list_add_name): Change type of symname,sym_text,
text,word parameters from char * to const char *.
(completion_list_objc_symbol): Change type of sym_text,
text,word parameters from char * to const char *.
* ada-lang.c (find_struct_field): Change type of name parameter
from char * to const char *.
(encoded_ordered_before): Similarly for N0,N1 parameters.
(old_renaming_is_invisible): Similarly for function_name parameter.
(ada_type_name): Change result type from char * to const char *.
All callers updated.
* ada-lang.h (ada_type_name): Update.
* buildsym.c (hashname): Change type of name parameter
from char * to const char *.
* buildsym.h (hashname): Update.
* dbxread.c (end_psymtab): Change type of include_list parameter
from char ** to const char **.
* dwarf2read.c (determine_prefix): Change result type
from char * to const char *. All callers updated.
* f-lang.c (find_common_for_function): Change type of name, funcname
parameters from char * to const char *.
* f-lang.c (find_common_for_function): Update.
* f-valprint.c (list_all_visible_commons): Change type of funcname
parameters from char * to const char *.
* gdbarch.sh (static_transform_name): Change type of name parameter
and result from char * to const char *.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* i386-sol2-tdep.c (i386_sol2_static_transform_name): Change type
of name parameter from char * to const char *.
* jv-lang.c (java_primitive_type_from_name): Ditto.
(java_demangled_signature_length): Similarly for signature parameter.
(java_demangled_signature_copy): Ditto.
(java_demangle_type_signature): Ditto.
* jv-lang.h (java_primitive_type_from_name): Update.
(java_demangle_type_signature): Update.
* objc-lang.c (specialcmp): Change type of a,b parameters
from char * to const char *.
* p-lang.c (is_pascal_string_type): Change type of arrayname parameter
from char * to const char *. All callers updated.
* p-lang.h (is_pascal_string_type): Update.
* solib-frv.c (find_canonical_descriptor_in_load_object): Change type
of name parameter from char * to const char *.
* sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* defs.h (fprintf_symbol_filtered): Update.
* sparc-tdep.h (sparc_sol2_static_transform_name): Update.
* stabsread.h (end_psymtab): Update.
* stack.c (find_frame_funname): Change type of funname parameter
from char ** to const char **.
* stack.h (find_frame_funname): Update.
* typeprint.c (type_print): Change type of varstring parameter
from char * to const char *.
* value.h (type_print): Update.
* xcoffread.c (xcoff_start_psymtab): Change type of filename parameter
from char * to const char *. All callers updated.
(xcoff_end_psymtab): Change type of include_list parameter
from char ** to const char **. All callers updated.
(swap_sym): Similarly for name parameter. All callers updated.
* coffread.c (patch_type): Add (char*) cast to xfree parameter.
Use xstrdup.
(process_coff_symbol): Use xstrdup.
* stabsread.c (stabs_method_name_from_physname): Renamed from
update_method_name_from_physname. Change result type from void
to char *. All callers updated.
(read_member_functions): In has_destructor case, store name in objfile
obstack instead of malloc space. In !has_stub case, fix mem leak.
2012-02-07 12:48:23 +08:00
|
|
|
|
fprintf_symbol_filtered (struct ui_file *stream, const char *name,
|
2003-02-01 06:45:22 +08:00
|
|
|
|
enum language lang, int arg_mode)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *demangled;
|
|
|
|
|
|
|
|
|
|
if (name != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* If user wants to see raw output, no problem. */
|
|
|
|
|
if (!demangle)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (name, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-04-02 11:02:46 +08:00
|
|
|
|
demangled = language_demangle (language_def (lang), name, arg_mode);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
fputs_filtered (demangled ? demangled : name, stream);
|
|
|
|
|
if (demangled != NULL)
|
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (demangled);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Do a strcmp() type operation on STRING1 and STRING2, ignoring any
|
|
|
|
|
differences in whitespace. Returns 0 if they match, non-zero if they
|
|
|
|
|
don't (slightly different than strcmp()'s range of return values).
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
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++
|
2011-01-12 09:23:29 +08:00
|
|
|
|
function). */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
strcmp_iw (const char *string1, const char *string2)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
while ((*string1 != '\0') && (*string2 != '\0'))
|
|
|
|
|
{
|
|
|
|
|
while (isspace (*string1))
|
|
|
|
|
{
|
|
|
|
|
string1++;
|
|
|
|
|
}
|
|
|
|
|
while (isspace (*string2))
|
|
|
|
|
{
|
|
|
|
|
string2++;
|
|
|
|
|
}
|
2011-04-28 04:03:04 +08:00
|
|
|
|
if (case_sensitivity == case_sensitive_on && *string1 != *string2)
|
|
|
|
|
break;
|
|
|
|
|
if (case_sensitivity == case_sensitive_off
|
|
|
|
|
&& (tolower ((unsigned char) *string1)
|
|
|
|
|
!= tolower ((unsigned char) *string2)))
|
|
|
|
|
break;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (*string1 != '\0')
|
|
|
|
|
{
|
|
|
|
|
string1++;
|
|
|
|
|
string2++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (*string1 != '\0' && *string1 != '(') || (*string2 != '\0');
|
|
|
|
|
}
|
2003-02-05 02:07:01 +08:00
|
|
|
|
|
2003-02-25 07:37:02 +08:00
|
|
|
|
/* This is like strcmp except that it ignores whitespace and treats
|
|
|
|
|
'(' as the first non-NULL character in terms of ordering. Like
|
|
|
|
|
strcmp (and unlike strcmp_iw), it returns negative if STRING1 <
|
|
|
|
|
STRING2, 0 if STRING2 = STRING2, and positive if STRING1 > STRING2
|
|
|
|
|
according to that ordering.
|
|
|
|
|
|
|
|
|
|
If a list is sorted according to this function and if you want to
|
|
|
|
|
find names in the list that match some fixed NAME according to
|
|
|
|
|
strcmp_iw(LIST_ELT, NAME), then the place to start looking is right
|
|
|
|
|
where this function would put NAME.
|
|
|
|
|
|
2011-04-28 04:03:04 +08:00
|
|
|
|
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.
|
|
|
|
|
|
2003-02-25 07:37:02 +08:00
|
|
|
|
Here are some examples of why using strcmp to sort is a bad idea:
|
|
|
|
|
|
|
|
|
|
Whitespace example:
|
|
|
|
|
|
|
|
|
|
Say your partial symtab contains: "foo<char *>", "goo". Then, if
|
|
|
|
|
we try to do a search for "foo<char*>", strcmp will locate this
|
|
|
|
|
after "foo<char *>" and before "goo". Then lookup_partial_symbol
|
|
|
|
|
will start looking at strings beginning with "goo", and will never
|
|
|
|
|
see the correct match of "foo<char *>".
|
|
|
|
|
|
|
|
|
|
Parenthesis example:
|
|
|
|
|
|
|
|
|
|
In practice, this is less like to be an issue, but I'll give it a
|
|
|
|
|
shot. Let's assume that '$' is a legitimate character to occur in
|
|
|
|
|
symbols. (Which may well even be the case on some systems.) Then
|
|
|
|
|
say that the partial symbol table contains "foo$" and "foo(int)".
|
|
|
|
|
strcmp will put them in this order, since '$' < '('. Now, if the
|
|
|
|
|
user searches for "foo", then strcmp will sort "foo" before "foo$".
|
|
|
|
|
Then lookup_partial_symbol will notice that strcmp_iw("foo$",
|
|
|
|
|
"foo") is false, so it won't proceed to the actual match of
|
|
|
|
|
"foo(int)" with "foo". */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
strcmp_iw_ordered (const char *string1, const char *string2)
|
|
|
|
|
{
|
2011-04-28 04:03:04 +08:00
|
|
|
|
const char *saved_string1 = string1, *saved_string2 = string2;
|
|
|
|
|
enum case_sensitivity case_pass = case_sensitive_off;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
2003-02-25 07:37:02 +08:00
|
|
|
|
{
|
2011-04-28 03:52:22 +08:00
|
|
|
|
/* 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')
|
2003-02-25 07:37:02 +08:00
|
|
|
|
{
|
2011-04-28 03:52:22 +08:00
|
|
|
|
while (isspace (*string1))
|
|
|
|
|
string1++;
|
|
|
|
|
while (isspace (*string2))
|
|
|
|
|
string2++;
|
|
|
|
|
|
2011-04-28 04:03:04 +08:00
|
|
|
|
switch (case_pass)
|
|
|
|
|
{
|
|
|
|
|
case case_sensitive_off:
|
|
|
|
|
c1 = tolower ((unsigned char) *string1);
|
|
|
|
|
c2 = tolower ((unsigned char) *string2);
|
|
|
|
|
break;
|
|
|
|
|
case case_sensitive_on:
|
2011-04-28 03:52:22 +08:00
|
|
|
|
c1 = *string1;
|
|
|
|
|
c2 = *string2;
|
2011-04-28 04:03:04 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
2011-04-28 03:52:22 +08:00
|
|
|
|
if (c1 != c2)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (*string1 != '\0')
|
|
|
|
|
{
|
|
|
|
|
string1++;
|
|
|
|
|
string2++;
|
|
|
|
|
}
|
2003-02-25 07:37:02 +08:00
|
|
|
|
}
|
2011-04-28 03:52:22 +08:00
|
|
|
|
|
|
|
|
|
switch (*string1)
|
2003-02-25 07:37:02 +08:00
|
|
|
|
{
|
2011-04-28 03:52:22 +08:00
|
|
|
|
/* 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')
|
2011-04-28 04:03:04 +08:00
|
|
|
|
break;
|
2011-04-28 03:52:22 +08:00
|
|
|
|
else
|
|
|
|
|
return -1;
|
|
|
|
|
case '(':
|
|
|
|
|
if (*string2 == '\0')
|
|
|
|
|
return 1;
|
|
|
|
|
else
|
|
|
|
|
return -1;
|
|
|
|
|
default:
|
|
|
|
|
if (*string2 == '\0' || *string2 == '(')
|
|
|
|
|
return 1;
|
2011-04-28 04:03:04 +08:00
|
|
|
|
else if (c1 > c2)
|
|
|
|
|
return 1;
|
|
|
|
|
else if (c1 < c2)
|
|
|
|
|
return -1;
|
|
|
|
|
/* PASSTHRU */
|
2003-02-25 07:37:02 +08:00
|
|
|
|
}
|
2011-04-28 04:03:04 +08:00
|
|
|
|
|
|
|
|
|
if (case_pass == case_sensitive_on)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* 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;
|
2003-02-25 07:37:02 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-05 02:07:01 +08:00
|
|
|
|
/* A simple comparison function with opposite semantics to strcmp. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
streq (const char *lhs, const char *rhs)
|
|
|
|
|
{
|
|
|
|
|
return !strcmp (lhs, rhs);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/*
|
1999-07-08 04:19:36 +08:00
|
|
|
|
** subset_compare()
|
|
|
|
|
** Answer whether string_to_compare is a full or partial match to
|
|
|
|
|
** template_string. The partial match must be in sequence starting
|
|
|
|
|
** at index 0.
|
|
|
|
|
*/
|
1999-04-16 09:35:26 +08:00
|
|
|
|
int
|
2000-07-30 09:48:28 +08:00
|
|
|
|
subset_compare (char *string_to_compare, char *template_string)
|
1999-04-27 02:34:20 +08:00
|
|
|
|
{
|
|
|
|
|
int match;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2003-02-01 06:45:22 +08:00
|
|
|
|
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);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
else
|
|
|
|
|
match = 0;
|
|
|
|
|
return match;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
pagination_on_command (char *arg, int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
pagination_enabled = 1;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
static void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
pagination_off_command (char *arg, int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
pagination_enabled = 0;
|
|
|
|
|
}
|
2008-02-28 04:50:49 +08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
show_debug_timestamp (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
2011-01-06 06:22:53 +08:00
|
|
|
|
fprintf_filtered (file, _("Timestamping debugging messages is %s.\n"),
|
|
|
|
|
value);
|
2008-02-28 04:50:49 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
initialize_utils (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2005-02-19 03:49:52 +08:00
|
|
|
|
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_width_command,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_chars_per_line,
|
2005-02-19 03:49:52 +08:00
|
|
|
|
&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_height_command,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_lines_per_page,
|
2005-02-19 03:49:52 +08:00
|
|
|
|
&setlist, &showlist);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
init_page_info ();
|
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
add_setshow_boolean_cmd ("pagination", class_support,
|
|
|
|
|
&pagination_enabled, _("\
|
|
|
|
|
Set state of pagination."), _("\
|
|
|
|
|
Show state of pagination."), NULL,
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_pagination_enabled,
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
&setlist, &showlist);
|
2000-04-27 08:15:14 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (xdb_commands)
|
|
|
|
|
{
|
1999-07-08 04:19:36 +08:00
|
|
|
|
add_com ("am", class_support, pagination_on_command,
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
_("Enable pagination"));
|
1999-07-08 04:19:36 +08:00
|
|
|
|
add_com ("sm", class_support, pagination_off_command,
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
_("Disable pagination"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
add_setshow_boolean_cmd ("sevenbit-strings", class_support,
|
|
|
|
|
&sevenbit_strings, _("\
|
|
|
|
|
Set printing of 8-bit characters in strings as \\nnn."), _("\
|
|
|
|
|
Show printing of 8-bit characters in strings as \\nnn."), NULL,
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_sevenbit_strings,
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
&setprintlist, &showprintlist);
|
|
|
|
|
|
2008-02-28 04:50:49 +08:00
|
|
|
|
add_setshow_boolean_cmd ("timestamp", class_maintenance,
|
|
|
|
|
&debug_timestamp, _("\
|
|
|
|
|
Set timestamping of debugging messages."), _("\
|
|
|
|
|
Show timestamping of debugging messages."), _("\
|
|
|
|
|
When set, debugging messages will be marked with seconds and microseconds."),
|
|
|
|
|
NULL,
|
|
|
|
|
show_debug_timestamp,
|
|
|
|
|
&setdebuglist, &showdebuglist);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Machine specific function to handle SIGWINCH signal. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
#ifdef SIGWINCH_HANDLER_BODY
|
1999-07-08 04:19:36 +08:00
|
|
|
|
SIGWINCH_HANDLER_BODY
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#endif
|
2011-01-12 09:23:29 +08:00
|
|
|
|
/* Print routines to handle variable size regs, etc. */
|
|
|
|
|
/* Temporary storage using circular buffer. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#define NUMCELLS 16
|
2004-09-11 23:04:16 +08:00
|
|
|
|
#define CELLSIZE 50
|
1999-07-08 04:19:36 +08:00
|
|
|
|
static char *
|
2000-07-30 09:48:28 +08:00
|
|
|
|
get_cell (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
static char buf[NUMCELLS][CELLSIZE];
|
1999-07-08 04:19:36 +08:00
|
|
|
|
static int cell = 0;
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
if (++cell >= NUMCELLS)
|
|
|
|
|
cell = 0;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return buf[cell];
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 22:37:38 +08:00
|
|
|
|
const char *
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-03 01:21:10 +08:00
|
|
|
|
paddress (struct gdbarch *gdbarch, CORE_ADDR addr)
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 22:37:38 +08:00
|
|
|
|
{
|
|
|
|
|
/* 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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
when it won't occur. */
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 22:37:38 +08:00
|
|
|
|
/* NOTE: This assumes that the significant address information is
|
|
|
|
|
kept in the least significant bits of ADDR - the upper bits were
|
2007-06-06 23:23:06 +08:00
|
|
|
|
either zero or sign extended. Should gdbarch_address_to_pointer or
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 22:37:38 +08:00
|
|
|
|
some ADDRESS_TO_PRINTABLE() be used to do the conversion? */
|
|
|
|
|
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-03 01:21:10 +08:00
|
|
|
|
int addr_bit = gdbarch_addr_bit (gdbarch);
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
* utils.c (paddress): New function.
* defs.h (paddress): Declare.
* printcmd.c (deprecated_print_address_numeric): Rename
print_address_numeric, call paddress.
* valprint.c, ui-out.c, tui/tui-stack.c, tracepoint.c: Update.
* symmisc.c, symfile.c stack.c, p-valprint.c, printcmd.c: Update.
* maint.c, m32r-rom.c, infcmd.c, f-valprint.c, exec.c: Update.
* dwarf2read.c, dve3900-rom.c, defs.h, c-valprint.c: Update.
* corefile.c, cli/cli-cmds.c, breakpoint.c, annotate.c: Update.
* ada-valprint.c: Update.
2005-02-14 22:37:38 +08:00
|
|
|
|
|
|
|
|
|
if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
|
|
|
|
|
addr &= ((CORE_ADDR) 1 << addr_bit) - 1;
|
|
|
|
|
return hex_string (addr);
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-31 22:32:49 +08:00
|
|
|
|
/* This function is described in "defs.h". */
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
print_core_address (struct gdbarch *gdbarch, CORE_ADDR address)
|
|
|
|
|
{
|
|
|
|
|
int addr_bit = gdbarch_addr_bit (gdbarch);
|
|
|
|
|
|
|
|
|
|
if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
|
|
|
|
|
address &= ((CORE_ADDR) 1 << addr_bit) - 1;
|
|
|
|
|
|
|
|
|
|
/* 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 hex_string_custom (address, 16);
|
|
|
|
|
}
|
|
|
|
|
|
gdb/
Implement basic support for DW_TAG_GNU_call_site.
* block.c: Include gdbtypes.h and exceptions.h.
(call_site_for_pc): New function.
* block.h (call_site_for_pc): New declaration.
* defs.h: Include hashtab.h.
(make_cleanup_htab_delete, core_addr_hash, core_addr_eq): New
declarations.
* dwarf2-frame.c (dwarf2_frame_ctx_funcs): Install
ctx_no_push_dwarf_reg_entry_value.
* dwarf2expr.c (read_uleb128, read_sleb128): Support R as NULL.
(dwarf_block_to_dwarf_reg): New function.
(execute_stack_op) <DW_OP_GNU_entry_value>: Implement it.
(ctx_no_push_dwarf_reg_entry_value): New function.
* dwarf2expr.h (struct dwarf_expr_context_funcs): New field
push_dwarf_reg_entry_value.
(ctx_no_push_dwarf_reg_entry_value, dwarf_block_to_dwarf_reg): New
declarations.
* dwarf2loc.c: Include gdbcmd.h.
(dwarf_expr_ctx_funcs): New forward declaration.
(entry_values_debug, show_entry_values_debug, call_site_to_target_addr)
(dwarf_expr_reg_to_entry_parameter)
(dwarf_expr_push_dwarf_reg_entry_value): New.
(dwarf_expr_ctx_funcs): Install dwarf_expr_push_dwarf_reg_entry_value.
(dwarf2_evaluate_loc_desc_full): Handle NO_ENTRY_VALUE_ERROR.
(needs_dwarf_reg_entry_value): New function.
(needs_frame_ctx_funcs): Install it.
(_initialize_dwarf2loc): New function.
* dwarf2loc.h (entry_values_debug): New declaration.
* dwarf2read.c (struct dwarf2_cu): New field call_site_htab.
(read_call_site_scope): New forward declaration.
(process_full_comp_unit): Copy call_site_htab.
(process_die): Support DW_TAG_GNU_call_site.
(read_call_site_scope): New function.
(dwarf2_get_pc_bounds): Support NULL HIGHPC.
(dwarf_tag_name): Support DW_TAG_GNU_call_site.
(cleanup_htab): Delete.
(write_psymtabs_to_index): Use make_cleanup_htab_delete instead of it.
* exceptions.h (enum errors): New NO_ENTRY_VALUE_ERROR.
* gdb-gdb.py (StructMainTypePrettyPrinter): Support
FIELD_LOC_KIND_DWARF_BLOCK.
* gdbtypes.h (enum field_loc_kind): New entry
FIELD_LOC_KIND_DWARF_BLOCK.
(struct main_type): New loc entry dwarf_block.
(struct call_site, FIELD_DWARF_BLOCK, SET_FIELD_DWARF_BLOCK)
(TYPE_FIELD_DWARF_BLOCK): New.
* python/py-type.c: Include dwarf2loc.h.
(check_types_equal): Support FIELD_LOC_KIND_DWARF_BLOCK. New
internal_error call on unknown FIELD_LOC_KIND.
* symtab.h (struct symtab): New field call_site_htab.
* utils.c (do_htab_delete_cleanup, make_cleanup_htab_delete)
(core_addr_hash, core_addr_eq): New functions.
gdb/testsuite/
Implement basic support for DW_TAG_GNU_call_site.
* gdb.arch/Makefile.in (EXECUTABLES): Add amd64-entry-value.
* gdb.arch/amd64-entry-value.cc: New file.
* gdb.arch/amd64-entry-value.exp: New file.
2011-10-10 03:21:39 +08:00
|
|
|
|
/* Callback hash_f for htab_create_alloc or htab_create_alloc_ex. */
|
|
|
|
|
|
|
|
|
|
hashval_t
|
|
|
|
|
core_addr_hash (const void *ap)
|
|
|
|
|
{
|
|
|
|
|
const CORE_ADDR *addrp = ap;
|
|
|
|
|
|
|
|
|
|
return *addrp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Callback eq_f for htab_create_alloc or htab_create_alloc_ex. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
core_addr_eq (const void *ap, const void *bp)
|
|
|
|
|
{
|
|
|
|
|
const CORE_ADDR *addr_ap = ap;
|
|
|
|
|
const CORE_ADDR *addr_bp = bp;
|
|
|
|
|
|
|
|
|
|
return *addr_ap == *addr_bp;
|
|
|
|
|
}
|
|
|
|
|
|
2005-03-19 04:46:38 +08:00
|
|
|
|
static char *
|
|
|
|
|
decimal2str (char *sign, ULONGEST addr, int width)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
2005-03-19 04:46:38 +08:00
|
|
|
|
/* Steal code from valprint.c:print_decimal(). Should this worry
|
2011-01-12 09:23:29 +08:00
|
|
|
|
about the real size of addr as the above does? */
|
1999-08-31 09:14:27 +08:00
|
|
|
|
unsigned long temp[3];
|
2005-03-19 04:46:38 +08:00
|
|
|
|
char *str = get_cell ();
|
1999-08-31 09:14:27 +08:00
|
|
|
|
int i = 0;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
temp[i] = addr % (1000 * 1000 * 1000);
|
|
|
|
|
addr /= (1000 * 1000 * 1000);
|
|
|
|
|
i++;
|
2004-09-11 18:24:53 +08:00
|
|
|
|
width -= 9;
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
width += 9;
|
|
|
|
|
if (width < 0)
|
|
|
|
|
width = 0;
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
switch (i)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%s%0*lu", sign, width, temp[0]);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu", sign, width,
|
|
|
|
|
temp[1], temp[0]);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
case 3:
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu%09lu", sign, width,
|
|
|
|
|
temp[2], temp[1], temp[0]);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("failed internal consistency check"));
|
2004-09-11 18:24:53 +08:00
|
|
|
|
}
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
|
|
|
|
return str;
|
2004-09-11 18:24:53 +08:00
|
|
|
|
}
|
|
|
|
|
|
2005-03-19 04:46:38 +08:00
|
|
|
|
static char *
|
|
|
|
|
octal2str (ULONGEST addr, int width)
|
2004-09-11 18:24:53 +08:00
|
|
|
|
{
|
|
|
|
|
unsigned long temp[3];
|
2005-03-19 04:46:38 +08:00
|
|
|
|
char *str = get_cell ();
|
2004-09-11 18:24:53 +08:00
|
|
|
|
int i = 0;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
temp[i] = addr % (0100000 * 0100000);
|
|
|
|
|
addr /= (0100000 * 0100000);
|
|
|
|
|
i++;
|
|
|
|
|
width -= 10;
|
|
|
|
|
}
|
|
|
|
|
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
width += 10;
|
|
|
|
|
if (width < 0)
|
|
|
|
|
width = 0;
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
switch (i)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
if (temp[0] == 0)
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%*o", width, 0);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
else
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "0%0*lo", width, temp[0]);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "0%0*lo%010lo", width, temp[1], temp[0]);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
break;
|
|
|
|
|
case 3:
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "0%0*lo%010lo%010lo", width,
|
|
|
|
|
temp[2], temp[1], temp[0]);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2003-02-01 06:45:22 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("failed internal consistency check"));
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
|
|
|
|
return str;
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
2008-09-05 06:49:30 +08:00
|
|
|
|
pulongest (ULONGEST u)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
2008-09-05 06:49:30 +08:00
|
|
|
|
return decimal2str ("", u, 0);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
2008-09-05 06:49:30 +08:00
|
|
|
|
plongest (LONGEST l)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
2008-09-05 06:49:30 +08:00
|
|
|
|
if (l < 0)
|
|
|
|
|
return decimal2str ("-", -l, 0);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
else
|
2008-09-05 06:49:30 +08:00
|
|
|
|
return decimal2str ("", l, 0);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
2005-03-19 04:46:38 +08:00
|
|
|
|
/* Eliminate warning from compiler on 32-bit systems. */
|
2000-05-22 10:07:19 +08:00
|
|
|
|
static int thirty_two = 32;
|
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
char *
|
2000-05-22 10:07:19 +08:00
|
|
|
|
phex (ULONGEST l, int sizeof_l)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
2001-11-16 02:35:05 +08:00
|
|
|
|
char *str;
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2000-05-22 10:07:19 +08:00
|
|
|
|
switch (sizeof_l)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
|
|
|
|
case 8:
|
2001-11-16 02:35:05 +08:00
|
|
|
|
str = get_cell ();
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%08lx%08lx",
|
|
|
|
|
(unsigned long) (l >> thirty_two),
|
|
|
|
|
(unsigned long) (l & 0xffffffff));
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
case 4:
|
2001-11-16 02:35:05 +08:00
|
|
|
|
str = get_cell ();
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%08lx", (unsigned long) l);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
2001-11-16 02:35:05 +08:00
|
|
|
|
str = get_cell ();
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%04x", (unsigned short) (l & 0xffff));
|
1999-08-31 09:14:27 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2001-11-16 02:35:05 +08:00
|
|
|
|
str = phex (l, sizeof (l));
|
2000-05-22 10:07:19 +08:00
|
|
|
|
break;
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2000-05-22 10:07:19 +08:00
|
|
|
|
return str;
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
char *
|
2000-05-22 10:07:19 +08:00
|
|
|
|
phex_nz (ULONGEST l, int sizeof_l)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2001-11-16 02:24:17 +08:00
|
|
|
|
char *str;
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2000-05-22 10:07:19 +08:00
|
|
|
|
switch (sizeof_l)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-07-08 04:19:36 +08:00
|
|
|
|
case 8:
|
|
|
|
|
{
|
2000-05-22 10:07:19 +08:00
|
|
|
|
unsigned long high = (unsigned long) (l >> thirty_two);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2001-11-16 02:24:17 +08:00
|
|
|
|
str = get_cell ();
|
1999-07-08 04:19:36 +08:00
|
|
|
|
if (high == 0)
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%lx",
|
|
|
|
|
(unsigned long) (l & 0xffffffff));
|
1999-07-08 04:19:36 +08:00
|
|
|
|
else
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%lx%08lx", high,
|
|
|
|
|
(unsigned long) (l & 0xffffffff));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
break;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
|
|
|
|
case 4:
|
2001-11-16 02:24:17 +08:00
|
|
|
|
str = get_cell ();
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%lx", (unsigned long) l);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
2001-11-16 02:24:17 +08:00
|
|
|
|
str = get_cell ();
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "%x", (unsigned short) (l & 0xffff));
|
1999-07-08 04:19:36 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2001-11-16 02:24:17 +08:00
|
|
|
|
str = phex_nz (l, sizeof (l));
|
2000-05-22 10:07:19 +08:00
|
|
|
|
break;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
2005-03-19 04:46:38 +08:00
|
|
|
|
|
2000-05-22 10:07:19 +08:00
|
|
|
|
return str;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
2000-06-04 21:46:37 +08:00
|
|
|
|
|
2004-09-11 23:04:16 +08:00
|
|
|
|
/* 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 ();
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2005-03-19 04:46:38 +08:00
|
|
|
|
xsnprintf (result, CELLSIZE, "0x%s", phex_nz (num, sizeof (num)));
|
2004-09-11 23:04:16 +08:00
|
|
|
|
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)
|
2011-01-06 06:22:53 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, _("\
|
|
|
|
|
hex_string_custom: insufficient space to store result"));
|
2004-09-11 23:04:16 +08:00
|
|
|
|
|
|
|
|
|
strcpy (result_end - width - 2, "0x");
|
|
|
|
|
memset (result_end - width, '0', width);
|
|
|
|
|
strcpy (result_end - hex_len, hex);
|
|
|
|
|
return result_end - width - 2;
|
|
|
|
|
}
|
2000-06-04 21:46:37 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
/* 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'
|
2011-01-12 09:23:29 +08:00
|
|
|
|
* and 'o' formats do not include a prefix (0x or leading 0). */
|
2004-09-11 18:24:53 +08:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
int_string (LONGEST val, int radix, int is_signed, int width,
|
|
|
|
|
int use_c_format)
|
|
|
|
|
{
|
|
|
|
|
switch (radix)
|
|
|
|
|
{
|
|
|
|
|
case 16:
|
|
|
|
|
{
|
|
|
|
|
char *result;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
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)
|
2005-03-19 04:46:38 +08:00
|
|
|
|
return decimal2str ("-", -val, width);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
else
|
2005-03-19 04:46:38 +08:00
|
|
|
|
return decimal2str ("", val, width);
|
2004-09-11 18:24:53 +08:00
|
|
|
|
}
|
|
|
|
|
case 8:
|
|
|
|
|
{
|
2005-03-19 04:46:38 +08:00
|
|
|
|
char *result = octal2str (val, width);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2004-09-11 18:24:53 +08:00
|
|
|
|
if (use_c_format || val == 0)
|
|
|
|
|
return result;
|
|
|
|
|
else
|
|
|
|
|
return result + 1;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("failed internal consistency check"));
|
2004-09-11 18:24:53 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
/* Convert a CORE_ADDR into a string. */
|
|
|
|
|
const char *
|
|
|
|
|
core_addr_to_string (const CORE_ADDR addr)
|
2002-02-13 14:06:26 +08:00
|
|
|
|
{
|
|
|
|
|
char *str = get_cell ();
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2002-02-13 14:06:26 +08:00
|
|
|
|
strcpy (str, "0x");
|
|
|
|
|
strcat (str, phex (addr, sizeof (addr)));
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
core_addr_to_string_nz (const CORE_ADDR addr)
|
2001-10-18 04:35:31 +08:00
|
|
|
|
{
|
|
|
|
|
char *str = get_cell ();
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
strcpy (str, "0x");
|
|
|
|
|
strcat (str, phex_nz (addr, sizeof (addr)));
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a string back into a CORE_ADDR. */
|
|
|
|
|
CORE_ADDR
|
|
|
|
|
string_to_core_addr (const char *my_string)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR addr = 0;
|
2007-12-18 01:49:29 +08:00
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
if (my_string[0] == '0' && tolower (my_string[1]) == 'x')
|
|
|
|
|
{
|
2007-03-30 17:31:31 +08:00
|
|
|
|
/* Assume that it is in hex. */
|
2001-10-18 04:35:31 +08:00
|
|
|
|
int i;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
for (i = 2; my_string[i] != '\0'; i++)
|
|
|
|
|
{
|
|
|
|
|
if (isdigit (my_string[i]))
|
|
|
|
|
addr = (my_string[i] - '0') + (addr * 16);
|
2003-02-01 06:45:22 +08:00
|
|
|
|
else if (isxdigit (my_string[i]))
|
2001-10-18 04:35:31 +08:00
|
|
|
|
addr = (tolower (my_string[i]) - 'a' + 0xa) + (addr * 16);
|
|
|
|
|
else
|
2006-11-18 03:30:41 +08:00
|
|
|
|
error (_("invalid hex \"%s\""), my_string);
|
2001-10-18 04:35:31 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Assume that it is in decimal. */
|
|
|
|
|
int i;
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
for (i = 0; my_string[i] != '\0'; i++)
|
|
|
|
|
{
|
|
|
|
|
if (isdigit (my_string[i]))
|
|
|
|
|
addr = (my_string[i] - '0') + (addr * 10);
|
|
|
|
|
else
|
2006-11-18 03:30:41 +08:00
|
|
|
|
error (_("invalid decimal \"%s\""), my_string);
|
2001-10-18 04:35:31 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
2007-12-18 01:49:29 +08:00
|
|
|
|
|
2001-10-18 04:35:31 +08:00
|
|
|
|
return addr;
|
|
|
|
|
}
|
2001-12-22 06:32:37 +08:00
|
|
|
|
|
2008-05-25 00:32:01 +08:00
|
|
|
|
const char *
|
|
|
|
|
host_address_to_string (const void *addr)
|
|
|
|
|
{
|
|
|
|
|
char *str = get_cell ();
|
2009-01-07 20:11:07 +08:00
|
|
|
|
|
2009-01-13 20:06:59 +08:00
|
|
|
|
xsnprintf (str, CELLSIZE, "0x%s", phex_nz ((uintptr_t) addr, sizeof (addr)));
|
2008-05-25 00:32:01 +08:00
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-22 06:32:37 +08:00
|
|
|
|
char *
|
|
|
|
|
gdb_realpath (const char *filename)
|
|
|
|
|
{
|
2002-11-13 01:19:06 +08:00
|
|
|
|
/* 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. */
|
2002-03-15 08:44:49 +08:00
|
|
|
|
#if defined(HAVE_REALPATH)
|
2002-11-13 01:19:06 +08:00
|
|
|
|
{
|
2002-03-15 08:44:49 +08:00
|
|
|
|
# if defined (PATH_MAX)
|
2002-11-13 01:19:06 +08:00
|
|
|
|
char buf[PATH_MAX];
|
2002-03-15 08:44:49 +08:00
|
|
|
|
# define USE_REALPATH
|
|
|
|
|
# elif defined (MAXPATHLEN)
|
2002-11-13 01:19:06 +08:00
|
|
|
|
char buf[MAXPATHLEN];
|
2002-03-15 08:44:49 +08:00
|
|
|
|
# define USE_REALPATH
|
|
|
|
|
# endif
|
2002-11-13 01:19:06 +08:00
|
|
|
|
# if defined (USE_REALPATH)
|
2002-11-13 04:26:05 +08:00
|
|
|
|
const char *rp = realpath (filename, buf);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
if (rp == NULL)
|
|
|
|
|
rp = filename;
|
|
|
|
|
return xstrdup (rp);
|
|
|
|
|
# endif
|
2003-02-26 22:35:19 +08:00
|
|
|
|
}
|
2002-03-15 08:44:49 +08:00
|
|
|
|
#endif /* HAVE_REALPATH */
|
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
/* Method 2: The host system (i.e., GNU) has the function
|
|
|
|
|
canonicalize_file_name() which malloc's a chunk of memory and
|
|
|
|
|
returns that, use that. */
|
|
|
|
|
#if defined(HAVE_CANONICALIZE_FILE_NAME)
|
|
|
|
|
{
|
|
|
|
|
char *rp = canonicalize_file_name (filename);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
if (rp == NULL)
|
|
|
|
|
return xstrdup (filename);
|
|
|
|
|
else
|
|
|
|
|
return rp;
|
|
|
|
|
}
|
2001-12-22 06:32:37 +08:00
|
|
|
|
#endif
|
2002-11-13 01:19:06 +08:00
|
|
|
|
|
2002-11-14 08:50:04 +08:00
|
|
|
|
/* FIXME: cagney/2002-11-13:
|
|
|
|
|
|
|
|
|
|
Method 2a: Use realpath() with a NULL buffer. Some systems, due
|
2011-04-20 02:04:11 +08:00
|
|
|
|
to the problems described in method 3, have modified their
|
2002-11-14 08:50:04 +08:00
|
|
|
|
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. */
|
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
/* 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);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
if (path_max > 0)
|
|
|
|
|
{
|
|
|
|
|
/* PATH_MAX is bounded. */
|
|
|
|
|
char *buf = alloca (path_max);
|
|
|
|
|
char *rp = realpath (filename, buf);
|
2010-05-17 09:15:20 +08:00
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
return xstrdup (rp ? rp : filename);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-12-27 12:03:58 +08:00
|
|
|
|
/* The MS Windows method. If we don't have realpath, we assume we
|
|
|
|
|
don't have symlinks and just canonicalize to a Windows absolute
|
|
|
|
|
path. GetFullPath converts ../ and ./ in relative paths to
|
|
|
|
|
absolute paths, filling in current drive if one is not given
|
|
|
|
|
or using the current directory of a specified drive (eg, "E:foo").
|
|
|
|
|
It also converts all forward slashes to back slashes. */
|
|
|
|
|
/* The file system is case-insensitive but case-preserving.
|
|
|
|
|
So we do not lowercase the path. Otherwise, we might not
|
|
|
|
|
be able to display the original casing in a given path. */
|
|
|
|
|
#if defined (_WIN32)
|
|
|
|
|
{
|
|
|
|
|
char buf[MAX_PATH];
|
|
|
|
|
DWORD len = GetFullPathName (filename, MAX_PATH, buf, NULL);
|
|
|
|
|
|
|
|
|
|
if (len > 0 && len < MAX_PATH)
|
|
|
|
|
return xstrdup (buf);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-11-13 01:19:06 +08:00
|
|
|
|
/* This system is a lost cause, just dup the buffer. */
|
|
|
|
|
return xstrdup (filename);
|
2001-12-22 06:32:37 +08:00
|
|
|
|
}
|
2002-04-06 00:39:11 +08:00
|
|
|
|
|
|
|
|
|
/* Return a copy of FILENAME, with its directory prefix canonicalized
|
|
|
|
|
by gdb_realpath. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
xfullpath (const char *filename)
|
|
|
|
|
{
|
|
|
|
|
const char *base_name = lbasename (filename);
|
|
|
|
|
char *dir_name;
|
|
|
|
|
char *real_path;
|
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
|
|
/* Extract the basename of filename, and return immediately
|
2011-01-12 09:23:29 +08:00
|
|
|
|
a copy of filename if it does not contain any directory prefix. */
|
2002-04-06 00:39:11 +08:00
|
|
|
|
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
|
2011-01-12 09:23:29 +08:00
|
|
|
|
then the closing \000 character. */
|
2002-04-06 00:39:11 +08:00
|
|
|
|
strncpy (dir_name, filename, base_name - filename);
|
|
|
|
|
dir_name[base_name - filename] = '\000';
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
|
|
|
|
|
/* We need to be careful when filename is of the form 'd:foo', which
|
|
|
|
|
is equivalent of d:./foo, which is totally different from d:/foo. */
|
2003-02-01 06:45:22 +08:00
|
|
|
|
if (strlen (dir_name) == 2 && isalpha (dir_name[0]) && dir_name[1] == ':')
|
2002-04-06 00:39:11 +08:00
|
|
|
|
{
|
|
|
|
|
dir_name[2] = '.';
|
|
|
|
|
dir_name[3] = '\000';
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Canonicalize the directory prefix, and build the resulting
|
2011-01-12 09:23:29 +08:00
|
|
|
|
filename. If the dirname realpath already contains an ending
|
2002-04-06 00:39:11 +08:00
|
|
|
|
directory separator, avoid doubling it. */
|
|
|
|
|
real_path = gdb_realpath (dir_name);
|
|
|
|
|
if (IS_DIR_SEPARATOR (real_path[strlen (real_path) - 1]))
|
2010-05-05 05:09:25 +08:00
|
|
|
|
result = concat (real_path, base_name, (char *) NULL);
|
2002-04-06 00:39:11 +08:00
|
|
|
|
else
|
2010-05-05 05:09:25 +08:00
|
|
|
|
result = concat (real_path, SLASH_STRING, base_name, (char *) NULL);
|
2002-04-06 00:39:11 +08:00
|
|
|
|
|
|
|
|
|
xfree (real_path);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
gdb/ChangeLog:
2003-01-23 Alexander Larsson <alexl@redhat.com>
Jim Blandy <jimb@redhat.com>
Add support for executables whose debug info has been separated
out into a separate file, leaving only a link behind.
* objfiles.h (struct objfile): New fields: separate_debug_objfile
and separate_debug_objfile_backlink.
(put_objfile_before): New declaration.
* symfile.c: #include "filenames.h".
(symbol_file_add_with_addrs_or_offsets): If this objfile has its
debug info in a separate file, read that, too. Save the addrs
argument, so we can use it again to read the separated debug info;
syms_from_objfile modifies the table we pass it.
(reread_symbols): After re-reading an objfile, call
reread_separate_symbols to refresh its separate debug info
objfile, if it has one.
(reread_separate_symbols, find_separate_debug_file,
get_debug_link_info, separate_debug_file_exists): New functions.
(debug_file_directory): New global var.
(_initialize_symfile): Initialize debug_file_directory, and
provide the new `set debug-file-directory' command to let the user
change it.
* objfiles.c (free_objfile): If this objfile has its debug info in
a separate objfile, free that one too. If this is itself a
separate debug info objfile, clear our parent's backlink.
(put_objfile_before): New function.
* utils.c (gnu_debuglink_crc32): New function.
* defs.h (gnu_debuglink_crc32): New declaration.
* Makefile.in (symfile.o): Note dependency on "filenames.h".
* configure.in: Handle --with-separate-debug-dir config option.
* acinclude.m4 (AC_DEFINE_DIR): New macro.
* acconfig.h (DEBUGDIR): New macro.
* configure, aclocal.m4, config.in: Regenerated.
gdb/doc/ChangeLog:
2003-01-23 Jim Blandy <jimb@redhat.com>
* gdb.texinfo (Separate Debug Files): New section.
2003-01-24 07:03:32 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
|
{
|
2009-08-14 06:35:29 +08:00
|
|
|
|
static const unsigned int crc32_table[256] = {
|
2003-02-01 06:45:22 +08:00
|
|
|
|
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
|
|
|
|
|
};
|
gdb/ChangeLog:
2003-01-23 Alexander Larsson <alexl@redhat.com>
Jim Blandy <jimb@redhat.com>
Add support for executables whose debug info has been separated
out into a separate file, leaving only a link behind.
* objfiles.h (struct objfile): New fields: separate_debug_objfile
and separate_debug_objfile_backlink.
(put_objfile_before): New declaration.
* symfile.c: #include "filenames.h".
(symbol_file_add_with_addrs_or_offsets): If this objfile has its
debug info in a separate file, read that, too. Save the addrs
argument, so we can use it again to read the separated debug info;
syms_from_objfile modifies the table we pass it.
(reread_symbols): After re-reading an objfile, call
reread_separate_symbols to refresh its separate debug info
objfile, if it has one.
(reread_separate_symbols, find_separate_debug_file,
get_debug_link_info, separate_debug_file_exists): New functions.
(debug_file_directory): New global var.
(_initialize_symfile): Initialize debug_file_directory, and
provide the new `set debug-file-directory' command to let the user
change it.
* objfiles.c (free_objfile): If this objfile has its debug info in
a separate objfile, free that one too. If this is itself a
separate debug info objfile, clear our parent's backlink.
(put_objfile_before): New function.
* utils.c (gnu_debuglink_crc32): New function.
* defs.h (gnu_debuglink_crc32): New declaration.
* Makefile.in (symfile.o): Note dependency on "filenames.h".
* configure.in: Handle --with-separate-debug-dir config option.
* acinclude.m4 (AC_DEFINE_DIR): New macro.
* acconfig.h (DEBUGDIR): New macro.
* configure, aclocal.m4, config.in: Regenerated.
gdb/doc/ChangeLog:
2003-01-23 Jim Blandy <jimb@redhat.com>
* gdb.texinfo (Separate Debug Files): New section.
2003-01-24 07:03:32 +08:00
|
|
|
|
unsigned char *end;
|
|
|
|
|
|
|
|
|
|
crc = ~crc & 0xffffffff;
|
|
|
|
|
for (end = buf + len; buf < end; ++buf)
|
|
|
|
|
crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
|
2011-03-06 06:02:47 +08:00
|
|
|
|
return ~crc & 0xffffffff;
|
gdb/ChangeLog:
2003-01-23 Alexander Larsson <alexl@redhat.com>
Jim Blandy <jimb@redhat.com>
Add support for executables whose debug info has been separated
out into a separate file, leaving only a link behind.
* objfiles.h (struct objfile): New fields: separate_debug_objfile
and separate_debug_objfile_backlink.
(put_objfile_before): New declaration.
* symfile.c: #include "filenames.h".
(symbol_file_add_with_addrs_or_offsets): If this objfile has its
debug info in a separate file, read that, too. Save the addrs
argument, so we can use it again to read the separated debug info;
syms_from_objfile modifies the table we pass it.
(reread_symbols): After re-reading an objfile, call
reread_separate_symbols to refresh its separate debug info
objfile, if it has one.
(reread_separate_symbols, find_separate_debug_file,
get_debug_link_info, separate_debug_file_exists): New functions.
(debug_file_directory): New global var.
(_initialize_symfile): Initialize debug_file_directory, and
provide the new `set debug-file-directory' command to let the user
change it.
* objfiles.c (free_objfile): If this objfile has its debug info in
a separate objfile, free that one too. If this is itself a
separate debug info objfile, clear our parent's backlink.
(put_objfile_before): New function.
* utils.c (gnu_debuglink_crc32): New function.
* defs.h (gnu_debuglink_crc32): New declaration.
* Makefile.in (symfile.o): Note dependency on "filenames.h".
* configure.in: Handle --with-separate-debug-dir config option.
* acinclude.m4 (AC_DEFINE_DIR): New macro.
* acconfig.h (DEBUGDIR): New macro.
* configure, aclocal.m4, config.in: Regenerated.
gdb/doc/ChangeLog:
2003-01-23 Jim Blandy <jimb@redhat.com>
* gdb.texinfo (Separate Debug Files): New section.
2003-01-24 07:03:32 +08:00
|
|
|
|
}
|
2003-09-20 00:22:39 +08:00
|
|
|
|
|
|
|
|
|
ULONGEST
|
|
|
|
|
align_up (ULONGEST v, int n)
|
|
|
|
|
{
|
|
|
|
|
/* Check that N is really a power of two. */
|
|
|
|
|
gdb_assert (n && (n & (n-1)) == 0);
|
|
|
|
|
return (v + n - 1) & -n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ULONGEST
|
|
|
|
|
align_down (ULONGEST v, int n)
|
|
|
|
|
{
|
|
|
|
|
/* Check that N is really a power of two. */
|
|
|
|
|
gdb_assert (n && (n & (n-1)) == 0);
|
|
|
|
|
return (v & -n);
|
|
|
|
|
}
|
gdb/
* Makefile.in (gdbtypes_h, gdbtypes.o, utils.o): Update.
* defs.h (hashtab_obstack_allocate, dummy_obstack_deallocate): Add
prototypes.
* dwarf2read.c (read_subroutine_type): Use TYPE_ZALLOC.
(hashtab_obstack_allocate, dummy_obstack_deallocate): Moved to...
* utils.c (hashtab_obstack_allocate, dummy_obstack_deallocate):
...here.
* gdbtypes.c: Include "hashtab.h".
(build_gdbtypes): Remove extra prototype.
(struct type_pair, type_pair_hash, type_pair_eq)
(create_copied_types_hash, copy_type_recursive): New.
* gdbtypes.h: Include "hashtab.h".
(TYPE_ZALLOC): New.
(create_copied_types_hash, copy_type_recursive): New prototypes.
* objfiles.c (free_objfile): Call preserve_values.
* symfile.c (reread_symbols): Likewise.
(clear_symtab_users): Remove calls to clear_value_history and
clear_internalvars.
* value.c (clear_value_history, clear_internalvars): Removed.
(preserve_one_value, preserve_values): New functions.
* value.h (clear_value_history, clear_internalvars): Removed.
(preserve_values): New prototype.
* tracepoint.c (_initialize_tracepoint): Do not initialize convenience
variables here.
gdb/doc/
* gdb.texinfo (Files): Remove obsolete bits from the description
of "symbol-file".
2006-02-02 07:14:11 +08:00
|
|
|
|
|
|
|
|
|
/* Allocation function for the libiberty hash table which uses an
|
|
|
|
|
obstack. The obstack is passed as DATA. */
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
hashtab_obstack_allocate (void *data, size_t size, size_t count)
|
|
|
|
|
{
|
|
|
|
|
unsigned int total = size * count;
|
|
|
|
|
void *ptr = obstack_alloc ((struct obstack *) data, total);
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
gdb/
* Makefile.in (gdbtypes_h, gdbtypes.o, utils.o): Update.
* defs.h (hashtab_obstack_allocate, dummy_obstack_deallocate): Add
prototypes.
* dwarf2read.c (read_subroutine_type): Use TYPE_ZALLOC.
(hashtab_obstack_allocate, dummy_obstack_deallocate): Moved to...
* utils.c (hashtab_obstack_allocate, dummy_obstack_deallocate):
...here.
* gdbtypes.c: Include "hashtab.h".
(build_gdbtypes): Remove extra prototype.
(struct type_pair, type_pair_hash, type_pair_eq)
(create_copied_types_hash, copy_type_recursive): New.
* gdbtypes.h: Include "hashtab.h".
(TYPE_ZALLOC): New.
(create_copied_types_hash, copy_type_recursive): New prototypes.
* objfiles.c (free_objfile): Call preserve_values.
* symfile.c (reread_symbols): Likewise.
(clear_symtab_users): Remove calls to clear_value_history and
clear_internalvars.
* value.c (clear_value_history, clear_internalvars): Removed.
(preserve_one_value, preserve_values): New functions.
* value.h (clear_value_history, clear_internalvars): Removed.
(preserve_values): New prototype.
* tracepoint.c (_initialize_tracepoint): Do not initialize convenience
variables here.
gdb/doc/
* gdb.texinfo (Files): Remove obsolete bits from the description
of "symbol-file".
2006-02-02 07:14:11 +08:00
|
|
|
|
memset (ptr, 0, total);
|
|
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Trivial deallocation function for the libiberty splay tree and hash
|
|
|
|
|
table - don't deallocate anything. Rely on later deletion of the
|
|
|
|
|
obstack. DATA will be the obstack, although it is not needed
|
|
|
|
|
here. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dummy_obstack_deallocate (void *object, void *data)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
2006-09-21 21:50:51 +08:00
|
|
|
|
|
|
|
|
|
/* The bit offset of the highest byte in a ULONGEST, for overflow
|
|
|
|
|
checking. */
|
|
|
|
|
|
|
|
|
|
#define HIGH_BYTE_POSN ((sizeof (ULONGEST) - 1) * HOST_CHAR_BIT)
|
|
|
|
|
|
|
|
|
|
/* True (non-zero) iff DIGIT is a valid digit in radix BASE,
|
|
|
|
|
where 2 <= BASE <= 36. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_digit_in_base (unsigned char digit, int base)
|
|
|
|
|
{
|
|
|
|
|
if (!isalnum (digit))
|
|
|
|
|
return 0;
|
|
|
|
|
if (base <= 10)
|
|
|
|
|
return (isdigit (digit) && digit < base + '0');
|
|
|
|
|
else
|
|
|
|
|
return (isdigit (digit) || tolower (digit) < base - 10 + 'a');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
digit_to_int (unsigned char c)
|
|
|
|
|
{
|
|
|
|
|
if (isdigit (c))
|
|
|
|
|
return c - '0';
|
|
|
|
|
else
|
|
|
|
|
return tolower (c) - 'a' + 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* As for strtoul, but for ULONGEST results. */
|
|
|
|
|
|
|
|
|
|
ULONGEST
|
|
|
|
|
strtoulst (const char *num, const char **trailer, int base)
|
|
|
|
|
{
|
|
|
|
|
unsigned int high_part;
|
|
|
|
|
ULONGEST result;
|
|
|
|
|
int minus = 0;
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
/* Skip leading whitespace. */
|
|
|
|
|
while (isspace (num[i]))
|
|
|
|
|
i++;
|
|
|
|
|
|
|
|
|
|
/* Handle prefixes. */
|
|
|
|
|
if (num[i] == '+')
|
|
|
|
|
i++;
|
|
|
|
|
else if (num[i] == '-')
|
|
|
|
|
{
|
|
|
|
|
minus = 1;
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (base == 0 || base == 16)
|
|
|
|
|
{
|
|
|
|
|
if (num[i] == '0' && (num[i + 1] == 'x' || num[i + 1] == 'X'))
|
|
|
|
|
{
|
|
|
|
|
i += 2;
|
|
|
|
|
if (base == 0)
|
|
|
|
|
base = 16;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (base == 0 && num[i] == '0')
|
|
|
|
|
base = 8;
|
|
|
|
|
|
|
|
|
|
if (base == 0)
|
|
|
|
|
base = 10;
|
|
|
|
|
|
|
|
|
|
if (base < 2 || base > 36)
|
|
|
|
|
{
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = high_part = 0;
|
|
|
|
|
for (; is_digit_in_base (num[i], base); i += 1)
|
|
|
|
|
{
|
|
|
|
|
result = result * base + digit_to_int (num[i]);
|
|
|
|
|
high_part = high_part * base + (unsigned int) (result >> HIGH_BYTE_POSN);
|
|
|
|
|
result &= ((ULONGEST) 1 << HIGH_BYTE_POSN) - 1;
|
|
|
|
|
if (high_part > 0xff)
|
|
|
|
|
{
|
|
|
|
|
errno = ERANGE;
|
|
|
|
|
result = ~ (ULONGEST) 0;
|
|
|
|
|
high_part = 0;
|
|
|
|
|
minus = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (trailer != NULL)
|
|
|
|
|
*trailer = &num[i];
|
|
|
|
|
|
|
|
|
|
result = result + ((ULONGEST) high_part << HIGH_BYTE_POSN);
|
|
|
|
|
if (minus)
|
|
|
|
|
return -result;
|
|
|
|
|
else
|
|
|
|
|
return result;
|
|
|
|
|
}
|
2007-06-04 20:34:11 +08:00
|
|
|
|
|
|
|
|
|
/* Simple, portable version of dirname that does not modify its
|
|
|
|
|
argument. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
ldirname (const char *filename)
|
|
|
|
|
{
|
|
|
|
|
const char *base = lbasename (filename);
|
|
|
|
|
char *dirname;
|
|
|
|
|
|
|
|
|
|
while (base > filename && IS_DIR_SEPARATOR (base[-1]))
|
|
|
|
|
--base;
|
|
|
|
|
|
|
|
|
|
if (base == filename)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
dirname = xmalloc (base - filename + 2);
|
|
|
|
|
memcpy (dirname, filename, base - filename);
|
|
|
|
|
|
|
|
|
|
/* On DOS based file systems, convert "d:foo" to "d:.", so that we
|
|
|
|
|
create "d:./bar" later instead of the (different) "d:/bar". */
|
|
|
|
|
if (base - filename == 2 && IS_ABSOLUTE_PATH (base)
|
|
|
|
|
&& !IS_DIR_SEPARATOR (filename[0]))
|
|
|
|
|
dirname[base++ - filename] = '.';
|
|
|
|
|
|
|
|
|
|
dirname[base - filename] = '\0';
|
|
|
|
|
return dirname;
|
|
|
|
|
}
|
2008-10-04 00:36:10 +08:00
|
|
|
|
|
|
|
|
|
/* Call libiberty's buildargv, and return the result.
|
|
|
|
|
If buildargv fails due to out-of-memory, call nomem.
|
|
|
|
|
Therefore, the returned value is guaranteed to be non-NULL,
|
|
|
|
|
unless the parameter itself is NULL. */
|
|
|
|
|
|
|
|
|
|
char **
|
|
|
|
|
gdb_buildargv (const char *s)
|
|
|
|
|
{
|
|
|
|
|
char **argv = buildargv (s);
|
2010-05-11 04:58:00 +08:00
|
|
|
|
|
2008-10-04 00:36:10 +08:00
|
|
|
|
if (s != NULL && argv == NULL)
|
2011-07-22 Kwok Cheung Yeung <kcy@codesourcery.com>
gdb/
* defs.h: Add guard against inclusion in gdbserver.
(struct ptid, ptid_t): Move to common/ptid.h.
(xfree, xzalloc, xasprintf, xvasprintf, xstrprintf, xstrvprintf,
xsnprintf, internal_error): Move to common/common-utils.h.
(nomem): Delete.
* gdb_assert.h: Move into common/ sub-directory.
* gdb_locale.h: Ditto.
* gdb_dirent.h: Ditto.
* inferior.h (minus_one_ptid, null_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid):
Move into common/ptid.h.
* xml-support.c (xml_escape_text): Move into common/xml-utils.c.
(gdb_xml_create_parser_and_cleanup_1, xml_fetch_context_from_file):
Change nomem to malloc_failure.
* xml-support.h (xml_escape_text): Move into common/xml-utils.h.
* utils.c (nomem): Rename to malloc_failure.
(xmalloc, xzalloc, xrealloc, xcalloc, xfree, xstrprintf, xasprintf,
xvasprintf, xstrvprintf, xsnprintf): Move to common/common-utils.c.
(gdb_buildargv): Change nomem to malloc_failure.
* infrun.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal,
ptid_is_pid): Move into common/ptid.c.
(initialize_infrun): Delete initialization of null_ptid and
minus_one_ptid.
* linux-nat.c (linux_nat_xfer_osdata): Defer to
linux_common_xfer_osdata.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/ptid.c and common/buffer.c.
(HFILES_NO_SRCDIR): Add common/common-utils.h, common/xml-utils.h,
common/ptid.h, common/buffer.h and common/linux-osdata.h.
(COMMON_OBS): Add xml-utils.o, common-utils.o, buffer.o and ptid.o.
(common-utils.o, xml-utils.o, ptid.o, buffer.o, linux-osdata.o): New
rules.
* common/gdb_assert.h: New.
* common/gdb_dirent.h: New.
* common/gdb_locale.h: New.
* common/buffer.c: New.
* common/buffer.h: New.
* common/ptid.c: New.
* common/ptid.h: New.
* common/xml-utils.c: New.
* common/xml-utils.h: New.
* common/common-utils.c: New.
* common/common-utils.h: New.
* common/linux-osdata.c: New.
* common/linux-osdata.h: New.
* config/alpha/alpha-linux.mh (NATDEPFILES): Add linux-osdata.o.
* config/arm/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux.mh (NATDEPFILES): Ditto.
* config/i386/linux64.mh (NATDEPFILES): Ditto.
* config/ia64/linux.mh (NATDEPFILES): Ditto.
* config/m32r/linux.mh (NATDEPFILES): Ditto.
* config/m68k/linux.mh (NATDEPFILES): Ditto.
* config/mips/linux.mh (NATDEPFILES): Ditto.
* config/pa/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/linux.mh (NATDEPFILES): Ditto.
* config/powerpc/ppc64-linux.mh (NATDEPFILES): Ditto.
* config/s390/s390.mh (NATDEPFILES): Ditto.
* config/sparc/linux.mh (NATDEPFILES): Ditto.
* config/sparc/linux64.mh (NATDEPFILES): Ditto.
* config/xtensa/linux.mh (NATDEPFILES): Ditto.
gdbserver/
* linux-low.c (compare_ints, unique, list_threads, show_process,
linux_core_of_thread): Delete.
(linux_target_ops): Change linux_core_of_thread to
linux_common_core_of_thread.
(linux_qxfer_osdata): Defer to linux_common_xfer_osdata.
* utils.c (malloc_failure): Change type of argument.
(xmalloc, xrealloc, xcalloc, xsnprintf): Delete.
* Makefile.in (SFILES): Add common/common-utils.c, common/xml-utils.c,
common/linux-osdata.c, common/ptid.c and common/buffer.c.
(OBS): Add xml-utils.o, common-utils.o, ptid.o and buffer.o.
(IPA_OBJS): Add common-utils-ipa.o.
(ptid_h, linux_osdata_h): New macros.
(server_h): Add common/common-utils.h, common/xml-utils.h,
common/buffer.h, common/gdb_assert.h, common/gdb_locale.h and
common/ptid.h.
(common-utils-ipa.o, common-utils.o, xml-utils.o, linux-osdata.o,
ptid.o, buffer.o): New rules.
(linux-low.o): Add common/linux-osdata.h as a dependency.
* configure.srv (srv_tgtobj): Add linux-osdata.o to Linux targets.
* configure.ac: Add AC_HEADER_DIRENT check.
* config.in: Regenerate.
* configure: Regenerate.
* remote-utils.c (xml_escape_text): Delete.
(buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf): Move to common/buffer.c.
* server.c (main): Remove call to initialize_inferiors.
* server.h (struct ptid, ptid_t, minus_one_ptid, null_ptid,
ptid_build, pid_to_ptid, ptid_get_pid, ptid_get_lwp, ptid_get_tid,
ptid_equal, ptid_is_pid, initialize_inferiors, xml_escape_text,
internal_error, gdb_assert, gdb_assert_fail): Delete.
(struct buffer, buffer_grow, buffer_free, buffer_init, buffer_finish,
buffer_xml_printf, buffer_grow_str, buffer_grow_str0): Move to
common/buffer.h.
* inferiors.c (null_ptid, minus_one_ptid, ptid_build, pid_to_ptid,
ptid_get_pid, ptid_get_lwp, ptid_get_tid, ptid_equal, ptid_is_pid,
initialize_inferiors): Delete.
2011-07-22 07:46:12 +08:00
|
|
|
|
malloc_failure (0);
|
2008-10-04 00:36:10 +08:00
|
|
|
|
return argv;
|
|
|
|
|
}
|
2009-01-27 00:24:27 +08:00
|
|
|
|
|
Implement core awareness.
* bcache.c (compare_ints): Remove
(print_percentage): Use compare_positive_ints.
* defs.h (compare_positive_ints): Declare.
* linux-nat.h (struct lin_lwp): New field core.
(linux_nat_core_of_thread_1): Declare.
* linux-nat.c (add_lwp): Init the 'core' field.
(linux_nat_wait_1): Record the core.
(linux_nat_core_of_thread_1, linux_nat_core_of_thread): New.
(linux_nat_add_target): Register the above.
* linux-thread-db.c (update_thread_core): New.
(thread_db_find_new_threads): Update core information for
every thread.
* remote.c (struct private_thread_info): New.
(free_private_thread_info, demand_private_info): New.
(PACKET_qXfer_threads, use_osdata_threads): New.
(struct thread_item, threads_parsing_context
(start_thread, end_thread, thread_attributes)
(thread_children, threads_children, threads_elements): New.
(remote_threads_info): Try qXfer:threads before anything
else.
(remote_protocol_packets): Register qXfer:threads.
(remote_open_1): Init use_osdata_threads.
(struct stop_reply): New field 'core'.
(remote_parse_stop_reply): Parse core number.
(process_stop_reply): Record core number.
(remote_xfer_partial): Handle qXfer:threads.
(remote_core_of_thread): New.
(init_remote_ops): Register remote_core_of_thread.
(_initialize_remote): Register qXfer:read.
* target.c (target_core_of_thread): New
* target.h (enum target_object): New value TARGET_OBJECT_THREADS.
(struct target_ops): New field to_core_of_threads.
(target_core_of_thread): Declare.
* gdbthread.h (struct thread_info): New field private_dtor.
* thread.c (print_thread_info): Report the core.
* ui-out.c (MAX_UI_OUT_LEVELS): Increase.
* utils.c (compare_positive_ints): New.
* features/threads.dtd: New.
* mi/mi-interp.c (mi_on_normal_stop): Report the core.
* mi/mi-main.c (struct collect_cores_data, collect_cores)
(do_nothing, free_vector_of_osdata_items)
(splay_tree_int_comparator, free_splay_tree): New.
(print_one_inferior_data): Implemented printing of selected
inferiors. Collect and print cores.
(output_cores): New.
(mi_cmd_list_thread_groups): Support --recurse. Permit specifying
thread groups together with --available.
2010-01-13 05:40:25 +08:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
the "ambiguous linespec" series
gdb
2011-12-06 Joel Brobecker <brobecker@acacore.com>
* language.h (struct language_defn): Add new component
la_symbol_name_compare.
* symfile.h (struct quick_symbol_functions): Update the profile
of parameter "name_matcher" for the expand_symtabs_matching
method. Update the documentation accordingly.
* ada-lang.h (ada_name_for_lookup): Add declaration.
* ada-lang.c (ada_name_for_lookup): New function, extracted out
from ada_iterate_over_symbols.
(ada_iterate_over_symbols): Do not encode symbol name anymore.
(ada_expand_partial_symbol_name): Adjust profile.
(ada_language_defn): Add value for la_symbol_name_compare field.
* linespec.c: #include "ada-lang.h".
(iterate_name_matcher): Add language parameter. Replace call
to strcmp_iw by call to language->la_symbol_name_compare.
(decode_variable): Encode COPY if current language is Ada.
* dwarf2read.c (dw2_expand_symtabs_matching): Adjust profile
of name_matcher parameter. Adjust call to name_matcher.
* psymtab.c (expand_symtabs_matching_via_partial): Likewise.
(expand_partial_symbol_names): Update profile of parameter "fun".
* psymtab.h (expand_partial_symbol_names): Update profile of
parameter "fun".
* symtab.c (demangle_for_lookup): Update function documentation.
(search_symbols_name_matches): Add language parameter.
(expand_partial_symbol_name): Likewise.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Add value for
la_symbol_name_compare field.
* d-lang.c (d_language_defn): Likewise.
* f-lang.c (f_language_defn): Ditto.
* jv-lang.c (java_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* opencl-lang.c (opencl_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* language.c (unknown_language_defn, auto_language_defn)
(local_language_defn): Ditto.
2011-12-06 Tom Tromey <tromey@redhat.com>
* linespec.c (iterate_over_all_matching_symtabs): Use
LA_ITERATE_OVER_SYMBOLS.
(lookup_prefix_sym, add_matching_symbols_to_info): Likewise.
(find_function_symbols, decode_variable): Remove Ada special
case.
* language.h (struct language_defn) <la_iterate_over_symbols>: New
field.
(LA_ITERATE_OVER_SYMBOLS): New macro.
* language.c (unknown_language_defn, auto_language_defn)
(local_language_defn): Update.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Update.
* d-lang.c (d_language_defn): Update.
* f-lang.c (f_language_defn): Update.
* jv-lang.c (java_language_defn): Update.
* m2-lang.c (m2_language_defn): Update.
* objc-lang.c (objc_language_defn): Update.
* opencl-lang.c (opencl_language_defn): Update.
* p-lang.c (pascal_language_defn): Update.
* ada-lang.c (ada_iterate_over_symbols): New function.
(ada_language_defn): Update.
2011-12-06 Tom Tromey <tromey@redhat.com>
Joel Brobecker <brobecker@acacore.com>
PR breakpoints/13105, PR objc/8341, PR objc/8343, PR objc/8366,
PR objc/8535, PR breakpoints/11657, PR breakpoints/11970,
PR breakpoints/12023, PR breakpoints/12334, PR breakpoints/12856,
PR shlibs/8929, PR shlibs/7393:
* python/py-type.c (compare_maybe_null_strings): Rename from
compare_strings.
(check_types_equal): Update.
* utils.c (compare_strings): New function.
* tui/tui-winsource.c (tui_update_breakpoint_info): Update for
location changes.
* tracepoint.c (scope_info): Update.
(trace_find_line_command): Use DECODE_LINE_FUNFIRSTLINE.
* symtab.h (iterate_over_minimal_symbols)
(iterate_over_some_symtabs, iterate_over_symtabs)
(find_pcs_for_symtab_line, iterate_over_symbols)
(demangle_for_lookup): Declare.
(expand_line_sal): Remove.
* symtab.c (iterate_over_some_symtabs, iterate_over_symtabs)
(lookup_symtab_callback): New functions.
(lookup_symtab): Rewrite.
(demangle_for_lookup): New function, extract from
lookup_symbol_in_language.
(lookup_symbol_in_language): Use it.
(iterate_over_symbols): New function.
(find_line_symtab): Update.
(find_pcs_for_symtab_line): New functions.
(find_line_common): Add 'start' argument.
(decode_line_spec): Update. Change argument to 'flags', change
interpretation.
(append_expanded_sal): Remove.
(append_exact_match_to_sals): Remove.
(expand_line_sal): Remove.
* symfile.h (struct quick_symbol_functions) <lookup_symtab>:
Remove.
<map_symtabs_matching_filename>: New field.
* stack.c (func_command): Only look in the current program space.
Use DECODE_LINE_FUNFIRSTLINE.
* source.c (line_info): Set pspace on sal. Check program space in
the loop. Use DECODE_LINE_LIST_MODE.
(select_source_symtab): Use DECODE_LINE_FUNFIRSTLINE.
* solib-target.c: Remove DEF_VEC_I(CORE_ADDR).
* python/python.c (gdbpy_decode_line): Update.
* psymtab.c (partial_map_expand_apply): New function.
(partial_map_symtabs_matching_filename): Rename from
lookup_partial_symbol. Update arguments.
(lookup_symtab_via_partial_symtab): Remove.
(psym_functions): Update.
* objc-lang.h (parse_selector, parse_method): Don't declare.
(find_imps): Update.
* objc-lang.c (parse_selector, parse_method): Now static.
(find_methods): Change arguments. Fill in a vector of symbol
names.
(uniquify_strings): New function.
(find_imps): Change arguments.
* minsyms.c (iterate_over_minimal_symbols): New function.
* linespec.h (enum decode_line_flags): New.
(struct linespec_sals): New.
(struct linespec_result) <canonical>: Remove.
<pre_expanded, addr_string, sals>: New fields.
(destroy_linespec_result, make_cleanup_destroy_linespec_result)
(decode_line_full): Declare.
(decode_line_1): Update.
* linespec.c (struct address_entry, struct linespec_state, struct
collect_info): New types.
(add_sal_to_sals_basic, add_sal_to_sals, hash_address_entry)
(eq_address_entry, maybe_add_address): New functions.
(total_number_of_methods): Remove.
(iterate_name_matcher, iterate_over_all_matching_symtabs): New
functions.
(find_methods): Change arguments. Don't canonicalize input.
Simplify logic.
(add_matching_methods, add_constructors)
(build_canonical_line_spec): Remove.
(filter_results, convert_results_to_lsals): New functions.
(decode_line_2): Change arguments. Rewrite for new data
structures.
(decode_line_internal): Rename from decode_line_1. Change
arguments. Add cleanups. Update for new data structures.
(linespec_state_constructor, linespec_state_destructor)
(decode_line_full, decode_line_1): New functions.
(decode_indirect): Change arguments. Update.
(locate_first_half): Use skip_spaces.
(decode_objc): Change arguments. Update for new data structures.
Simplify logic.
(decode_compound): Change arguments. Add cleanups. Remove
fallback code, replace with error.
(struct decode_compound_collector): New type.
(collect_one_symbol): New function.
(lookup_prefix_sym): Change arguments. Update.
(compare_symbol_name, add_all_symbol_names_from_pspace)
(find_superclass_methods ): New functions.
(find_method): Rewrite.
(struct symtab_collector): New type.
(add_symtabs_to_list, collect_symtabs_from_filename): New
functions.
(symtabs_from_filename): Change API. Rename from
symtab_from_filename.
(collect_function_symbols): New function.
(find_function_symbols): Change API. Rename from
find_function_symbol. Rewrite.
(decode_all_digits): Change arguments. Rewrite.
(decode_dollar): Change arguments. Use decode_variable.
(decode_label): Change arguments. Rewrite.
(collect_symbols): New function.
(minsym_found): Change arguments. Rewrite.
(check_minsym, search_minsyms_for_name)
(add_matching_symbols_to_info): New function.
(decode_variable): Change arguments. Iterate over all symbols.
(symbol_found): Remove.
(symbol_to_sal): New function.
(init_linespec_result, destroy_linespec_result)
(cleanup_linespec_result, make_cleanup_destroy_linespec_result):
New functions.
(decode_digits_list_mode, decode_digits_ordinary): New functions.
* dwarf2read.c (dw2_map_expand_apply): New function.
(dw2_map_symtabs_matching_filename): Rename from
dw2_lookup_symtab. Change arguments.
(dwarf2_gdb_index_functions): Update.
* dwarf2loc.c: Remove DEF_VEC_I(CORE_ADDR).
* defs.h (compare_strings): Declare.
* cli/cli-cmds.c (compare_strings): Move to utils.c.
(edit_command, list_command): Use DECODE_LINE_LIST_MODE. Call
filter_sals.
(compare_symtabs, filter_sals): New functions.
* breakpoint.h (struct bp_location) <line_number, source_file>:
New fields.
(struct breakpoint) <line_number, source_file>: Remove.
<filter>: New field.
* breakpoint.c (print_breakpoint_location, init_raw_breakpoint)
(momentary_breakpoint_from_master, add_location_to_breakpoint):
Update for changes to locations.
(init_breakpoint_sal): Add 'filter' argument. Set 'filter' on
breakpoint.
(create_breakpoint_sal): Add 'filter' argument.
(remove_sal, expand_line_sal_maybe): Remove.
(create_breakpoints_sal): Remove 'sals' argument. Handle
pre-expanded sals and the filter.
(parse_breakpoint_sals): Use decode_line_full.
(check_fast_tracepoint_sals): Use get_sal_arch.
(create_breakpoint): Create a linespec_sals. Update.
(break_range_command): Use decode_line_full. Update.
(until_break_command): Update.
(clear_command): Update match conditions for linespec.c changes.
Use DECODE_LINE_LIST_MODE.
(say_where): Update for changes to locations.
(bp_location_dtor): Free 'source_file'.
(base_breakpoint_dtor): Free 'filter'. Don't free 'source_file'.
(update_static_tracepoint): Update for changes to locations.
(update_breakpoint_locations): Disable ranged breakpoint if too
many locations match. Update.
(addr_string_to_sals): Use decode_line_full. Resolve all sal
PCs.
(breakpoint_re_set_default): Don't call expand_line_sal_maybe.
(decode_line_spec_1): Update. Change argument name to 'flags',
change interpretation.
* block.h (block_containing_function): Declare.
* block.c (block_containing_function): New function.
* skip.c (skip_function_command): Update.
(skip_re_set): Update.
* infcmd.c (jump_command): Use DECODE_LINE_FUNFIRSTLINE.
* mi/mi-main.c (mi_cmd_trace_find): Use DECODE_LINE_FUNFIRSTLINE.
* NEWS: Add entry.
2011-12-06 Tom Tromey <tromey@redhat.com>
* elfread.c (elf_gnu_ifunc_resolver_return_stop): Allow
breakpoint's pspace to be NULL.
* breakpoint.h (struct breakpoint) <pspace>: Update comment.
* breakpoint.c (init_raw_breakpoint): Conditionally set
breakpoint's pspace.
(init_breakpoint_sal): Don't set breakpoint's pspace.
(prepare_re_set_context): Conditionally switch program space.
(addr_string_to_sals): Check executing_startup on location's
program space.
2011-12-06 Tom Tromey <tromey@redhat.com>
* breakpoint.h (enum enable_state) <bp_startup_disabled>: Remove.
* breakpoint.c (should_be_inserted): Explicitly check if program
space is executing startup.
(describe_other_breakpoints): Update.
(disable_breakpoints_before_startup): Change executing_startup
earlier. Remove loop.
(enable_breakpoints_after_startup): Likewise.
(init_breakpoint_sal): Don't use bp_startup_disabled.
(create_breakpoint): Don't use bp_startup_disabled.
(update_global_location_list): Use should_be_inserted.
(bkpt_re_set): Update.
gdb/testsuite
2011-12-06 Joel Brobecker <brobecker@acacore.com>
* gdb.ada/fullname_bp.exp: Add tests for other valid linespecs
involving a fully qualified function name.
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.ada/homonym.exp: Add three breakpoint tests.
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.base/solib-weak.exp (do_test): Remove kfail.
* gdb.trace/tracecmd.exp: Disable pending breakpoints earlier.
* gdb.objc/objcdecode.exp: Update for output changes.
* gdb.linespec/linespec.exp: New file.
* gdb.linespec/lspec.cc: New file.
* gdb.linespec/lspec.h: New file.
* gdb.linespec/body.h: New file.
* gdb.linespec/base/two/thefile.cc: New file.
* gdb.linespec/base/one/thefile.cc: New file.
* gdb.linespec/Makefile.in: New file.
* gdb.cp/templates.exp (test_template_breakpoints): Update for
output changes.
* gdb.cp/re-set-overloaded.exp: Remove kfail.
* gdb.cp/ovldbreak.exp: Update for output changes. "all" test now
makes one breakpoint.
* gdb.cp/method2.exp (test_break): Update for output changes.
* gdb.cp/mb-templates.exp: Update for output changes.
* gdb.cp/mb-inline.exp: Update for output changes.
* gdb.cp/mb-ctor.exp: Update for output changes.
* gdb.cp/ovsrch.exp: Use fully-qualified names.
* gdb.base/solib-symbol.exp: Run to main later. Breakpoint now
has multiple matches.
* gdb.base/sepdebug.exp: Disable pending breakpoints. Update for
error message change.
* gdb.base/list.exp (test_list_filename_and_number): Update for
error message change.
* gdb.base/break.exp: Disable pending breakpoints. Update for
output changes.
* configure.ac: Add gdb.linespec.
* configure: Rebuild.
* Makefile.in (ALL_SUBDIRS): Add gdb.linespec.
gdb/doc
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.texinfo (Set Breaks): Update for new behavior.
2011-12-07 02:54:43 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-05 10:22:39 +08:00
|
|
|
|
#define AMBIGUOUS_MESS1 ".\nMatching formats:"
|
2011-01-06 06:22:53 +08:00
|
|
|
|
#define AMBIGUOUS_MESS2 \
|
|
|
|
|
".\nUse \"set gnutarget format-name\" to specify the format."
|
2010-02-05 10:22:39 +08:00
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-16 01:35:50 +08:00
|
|
|
|
/* Return ARGS parsed as a valid pid, or throw an error. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
parse_pid_to_attach (char *args)
|
|
|
|
|
{
|
|
|
|
|
unsigned long pid;
|
|
|
|
|
char *dummy;
|
|
|
|
|
|
|
|
|
|
if (!args)
|
|
|
|
|
error_no_arg (_("process-id to attach"));
|
|
|
|
|
|
|
|
|
|
dummy = 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;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-27 05:45:24 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-10 03:41:14 +08:00
|
|
|
|
/* 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)
|
|
|
|
|
{
|
|
|
|
|
const char *cs;
|
|
|
|
|
int major, minor;
|
|
|
|
|
|
|
|
|
|
if (producer == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* For unknown compilers expect their behavior is not compliant. For GCC
|
|
|
|
|
this case can also happen for -gdwarf-4 type units supported since
|
|
|
|
|
gcc-4.5. */
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Skip any identifier after "GNU " - such as "C++" or "Java". */
|
|
|
|
|
|
|
|
|
|
if (strncmp (producer, "GNU ", strlen ("GNU ")) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* For non-GCC compilers expect their behavior is not compliant. */
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
cs = &producer[strlen ("GNU ")];
|
|
|
|
|
while (*cs && !isdigit (*cs))
|
|
|
|
|
cs++;
|
|
|
|
|
if (sscanf (cs, "%d.%d", &major, &minor) != 2)
|
|
|
|
|
{
|
|
|
|
|
/* Not recognized as GCC. */
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (major < 4)
|
|
|
|
|
return -1;
|
|
|
|
|
if (major > 4)
|
|
|
|
|
return INT_MAX;
|
|
|
|
|
return minor;
|
|
|
|
|
}
|
|
|
|
|
|
gdb/
Code cleanup.
* charset.c (find_charset_names): Remove variables ix and elt.
Use free_char_ptr_vec.
* elfread.c (build_id_to_debug_filename): New variables debugdir_vec,
back_to and ix. Use dirnames_to_char_ptr_vec. Remove variable
debugdir_end. New variable debugdir_len.
* gdb_vecs.h (free_char_ptr_vec, make_cleanup_free_char_ptr_vec)
(dirnames_to_char_ptr_vec_append, dirnames_to_char_ptr_vec): New
declarations.
* progspace.c (clear_program_space_solib_cache): Remove variables ix
and elt. Use free_char_ptr_vec.
* source.c (add_path): Remove variables argv, arg and argv_index.
New variables dir_vec, back_to, ix and name.
Use dirnames_to_char_ptr_vec_append. Use freeargv instead of
make_cleanup_freeargv. Remove variable separator. Simplify the code
no longer expecting DIRNAME_SEPARATOR.
(openp): Remove variable p, p1 and len. New variables dir_vec,
back_to, ix and dir. Use dirnames_to_char_ptr_vec. Simplify the code
no longer expecting DIRNAME_SEPARATOR.
* symfile.c (find_separate_debug_file): New variables debugdir_vec,
back_to and ix. Use dirnames_to_char_ptr_vec. Remove variable
debugdir_end.
* utils.c (free_char_ptr_vec, do_free_char_ptr_vec)
(make_cleanup_free_char_ptr_vec, dirnames_to_char_ptr_vec_append)
(dirnames_to_char_ptr_vec): New functions.
2012-04-17 23:47:09 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-12 02:13:26 +08:00
|
|
|
|
/* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP
|
|
|
|
|
must come from xrealloc-compatible allocator and it may be updated. FROM
|
2012-05-21 04:35:19 +08:00
|
|
|
|
needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be
|
|
|
|
|
located at the start or end of *STRINGP. */
|
2012-05-12 02:13:26 +08:00
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2012-05-21 04:35:19 +08:00
|
|
|
|
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))
|
2012-05-12 02:13:26 +08:00
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-15 04:53:57 +08:00
|
|
|
|
#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 */
|
|
|
|
|
|
2012-07-02 18:57:34 +08:00
|
|
|
|
/* 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);
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
|
|
|
extern initialize_file_ftype _initialize_utils;
|
|
|
|
|
|
2009-01-27 00:24:27 +08:00
|
|
|
|
void
|
|
|
|
|
_initialize_utils (void)
|
|
|
|
|
{
|
|
|
|
|
add_internal_problem_command (&internal_error_problem);
|
|
|
|
|
add_internal_problem_command (&internal_warning_problem);
|
|
|
|
|
}
|