X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdefs.h;h=c568a125d73c65bdd851fc971423e25d7172d621;hb=53a71c068156f7c35e07ddd5c0cce97bf98c025c;hp=44eb9c1d604111fa555f0ced4cf7374b11884efa;hpb=22e9b0f12e97492fdffa9f212e61d877ffdb1030;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/defs.h b/gdb/defs.h index 44eb9c1d60..c568a125d7 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -1,14 +1,15 @@ -/* *INDENT-OFF* */ /* ATTR_FORMAT confuses indent, avoid running it for now */ +/* *INDENT-OFF* */ /* ATTRIBUTE_PRINTF confuses indent, avoid running it + for now. */ /* Basic, host-specific, and target-specific definitions for GDB. - Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, + 2010 Free Software Foundation, Inc. This file is part of GDB. 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,29 +18,43 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #ifndef DEFS_H #define DEFS_H #include "config.h" /* Generated by configure. */ +#include #include #include /* System call error return status. */ #include +#include + +/* The libdecnumber library, on which GDB depends, includes a header file + called gstdint.h instead of relying directly on stdint.h. GDB, on the + other hand, includes stdint.h directly, relying on the fact that gnulib + generates a copy if the system doesn't provide one or if it is missing + some features. Unfortunately, gstdint.h and stdint.h cannot be included + at the same time, which may happen when we include a file from + libdecnumber. + + The following macro definition effectively prevents the inclusion of + gstdint.h, as all the definitions it provides are guarded against + the GCC_GENERATED_STDINT_H macro. We already have gnulib/stdint.h + included, so it's ok to blank out gstdint.h. */ +#define GCC_GENERATED_STDINT_H 1 #ifdef HAVE_STDDEF_H #include -#else -#include /* For size_t. */ #endif #ifdef HAVE_UNISTD_H #include #endif +#include + /* First include ansidecl.h so we can use the various macro definitions here and in all subsequent file inclusions. */ @@ -47,6 +62,8 @@ #include "gdb_locale.h" +#include "gdb_wchar.h" + /* For ``enum target_signal''. */ #include "gdb/signals.h" @@ -59,21 +76,35 @@ #define SEEK_CUR 1 #endif +/* The O_BINARY flag is defined in fcntl.h on some non-Posix platforms. + It is used as an access modifier in calls to open(), where it acts + similarly to the "b" character in fopen()'s MODE argument. On Posix + platforms it should be a no-op, so it is defined as 0 here. This + ensures that the symbol may be used freely elsewhere in gdb. */ + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + #include /* For va_list. */ #include "libiberty.h" -/* For BFD64 and bfd_vma. */ +/* Rather than duplicate all the logic in BFD for figuring out what + types to use (which can be pretty complicated), symply define them + in terms of the corresponding type from BFD. */ + #include "bfd.h" -/* An address in the program being debugged. Host byte order. Rather - than duplicate all the logic in BFD which figures out what type - this is (long, long long, etc.) and whether it needs to be 64 - bits (the host/target interactions are subtle), we just use - bfd_vma. */ +/* A byte from the program being debugged. */ +typedef bfd_byte gdb_byte; +/* An address in the program being debugged. Host byte order. */ typedef bfd_vma CORE_ADDR; +/* The largest CORE_ADDR value. */ +#define CORE_ADDR_MAX (~ (CORE_ADDR) 0) + /* This is to make sure that LONGEST is at least as big as CORE_ADDR. */ #ifndef LONGEST @@ -111,38 +142,6 @@ typedef bfd_vma CORE_ADDR; #define max(a, b) ((a) > (b) ? (a) : (b)) #endif -/* Macros to do string compares. - - NOTE: cagney/2000-03-14: - - While old code can continue to refer to these macros, new code is - probably better off using strcmp() directly vis: ``strcmp() == 0'' - and ``strcmp() != 0''. - - This is because modern compilers can directly inline strcmp() - making the original justification for these macros - avoid function - call overhead by pre-testing the first characters - (``*X==*Y?...:0'') - redundant. - - ``Even if [...] testing the first character does have a modest - performance improvement, I'd rather that whenever a performance - issue is found that we spend the effort on algorithmic - optimizations than micro-optimizing.'' J.T. */ - -/* NOTE: cagney/2003-11-23: All instances of STREQ[N] covered by - testing GDB on a stabs system have been replaced by equivalent - str[n]cmp calls. To avoid the possability of introducing bugs when - making untested changes, the remaining references were deprecated - rather than replaced. */ - -/* DISCLAIMER: cagney/2003-11-23: Simplified definition of these - macros so that they just map directly onto strcmp equivalent. I'm - not responsible for any breakage due to code that relied on the old - underlying implementation. */ - -#define DEPRECATED_STREQ(a,b) (strcmp ((a), (b)) == 0) -#define DEPRECATED_STREQN(a,b,c) (strncmp ((a), (b), (c)) == 0) - /* Check if a character is one of the commonly used C++ marker characters. */ extern int is_cplus_marker (int); @@ -155,6 +154,16 @@ extern int dbx_commands; /* System root path, used to find libraries etc. */ extern char *gdb_sysroot; +/* GDB datadir, used to store data files. */ +extern char *gdb_datadir; + +/* If non-NULL, the possibly relocated path to python's "lib" directory + specified with --with-python. */ +extern char *python_libdir; + +/* Search path for separate debug files. */ +extern char *debug_file_directory; + extern int quit_flag; extern int immediate_quit; extern int sevenbit_strings; @@ -168,16 +177,10 @@ extern void quit (void); [kingdon]. A profile analyzing the current situtation is needed. */ -#ifdef QUIT -/* do twice to force compiler warning */ -#define QUIT_FIXME "FIXME" -#define QUIT_FIXME "ignoring redefinition of QUIT" -#else #define QUIT { \ if (quit_flag) quit (); \ if (deprecated_interactive_hook) deprecated_interactive_hook (); \ } -#endif /* Languages represented in the symbol table and elsewhere. This should probably be in language.h, but since enum's can't @@ -190,14 +193,15 @@ enum language language_auto, /* Placeholder for automatic setting */ language_c, /* C */ language_cplus, /* C++ */ + language_d, /* D */ language_objc, /* Objective-C */ language_java, /* Java */ language_fortran, /* Fortran */ language_m2, /* Modula-2 */ language_asm, /* Assembly language */ - language_scm, /* Scheme / Guile */ language_pascal, /* Pascal */ language_ada, /* Ada */ + language_scm, /* Guile Scheme */ language_minimal, /* All other languages, minimal support only */ nr_languages }; @@ -252,53 +256,21 @@ enum return_value_convention Use make_cleanup to add an element to the cleanup chain. Use do_cleanups to do all cleanup actions back to a given point in the chain. Use discard_cleanups to remove cleanups - from the chain back to a given point, not doing them. */ + from the chain back to a given point, not doing them. + + If the argument is pointer to allocated memory, then you need to + to additionally set the 'free_arg' member to a function that will + free that memory. This function will be called both when the cleanup + is executed and when it's discarded. */ struct cleanup { struct cleanup *next; void (*function) (void *); + void (*free_arg) (void *); void *arg; }; - -/* The ability to declare that a function never returns is useful, but - not really required to compile GDB successfully, so the NORETURN and - ATTR_NORETURN macros normally expand into nothing. */ - -/* If compiling with older versions of GCC, a function may be declared - "volatile" to indicate that it does not return. */ - -#ifndef NORETURN -#if defined(__GNUC__) \ - && (__GNUC__ == 1 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)) -#define NORETURN volatile -#else -#define NORETURN /* nothing */ -#endif -#endif - -/* GCC 2.5 and later versions define a function attribute "noreturn", - which is the preferred way to declare that a function never returns. - However GCC 2.7 appears to be the first version in which this fully - works everywhere we use it. */ - -#ifndef ATTR_NORETURN -#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) -#define ATTR_NORETURN __attribute__ ((noreturn)) -#else -#define ATTR_NORETURN /* nothing */ -#endif -#endif - -#ifndef ATTR_FORMAT -#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4)) -#define ATTR_FORMAT(type, x, y) __attribute__ ((format(type, x, y))) -#else -#define ATTR_FORMAT(type, x, y) /* nothing */ -#endif -#endif - /* Be conservative and use enum bitfields only with GCC. This is copied from gcc 3.3.1, system.h. */ @@ -308,11 +280,16 @@ struct cleanup #define ENUM_BITFIELD(TYPE) unsigned int #endif +/* vec.h-style vectors of strings want a typedef for char * . */ + +typedef char * char_ptr; + /* Needed for various prototypes */ struct symtab; struct breakpoint; struct frame_info; +struct gdbarch; /* From utils.c */ @@ -330,19 +307,17 @@ extern int subset_compare (char *, char *); extern char *safe_strerror (int); -extern void request_quit (int); +extern void set_display_time (int); + +extern void set_display_space (int); #define ALL_CLEANUPS ((struct cleanup *)0) extern void do_cleanups (struct cleanup *); extern void do_final_cleanups (struct cleanup *); -extern void do_run_cleanups (struct cleanup *); -extern void do_exec_cleanups (struct cleanup *); -extern void do_exec_error_cleanups (struct cleanup *); extern void discard_cleanups (struct cleanup *); extern void discard_final_cleanups (struct cleanup *); -extern void discard_exec_error_cleanups (struct cleanup *); extern void discard_my_cleanups (struct cleanup **, struct cleanup *); /* NOTE: cagney/2000-03-04: This typedef is strictly for the @@ -354,6 +329,9 @@ typedef void (make_cleanup_ftype) (void *); extern struct cleanup *make_cleanup (make_cleanup_ftype *, void *); +extern struct cleanup *make_cleanup_dtor (make_cleanup_ftype *, void *, + void (*dtor) (void *)); + extern struct cleanup *make_cleanup_freeargv (char **); struct ui_file; @@ -365,17 +343,26 @@ extern struct cleanup *(make_cleanup_free_section_addr_info extern struct cleanup *make_cleanup_close (int fd); +extern struct cleanup *make_cleanup_fclose (FILE *file); + extern struct cleanup *make_cleanup_bfd_close (bfd *abfd); +struct obstack; +extern struct cleanup *make_cleanup_obstack_free (struct obstack *obstack); + +extern struct cleanup *make_cleanup_restore_integer (int *variable); + +struct target_ops; +extern struct cleanup *make_cleanup_unpush_target (struct target_ops *ops); + extern struct cleanup *make_final_cleanup (make_cleanup_ftype *, void *); extern struct cleanup *make_my_cleanup (struct cleanup **, make_cleanup_ftype *, void *); -extern struct cleanup *make_run_cleanup (make_cleanup_ftype *, void *); - -extern struct cleanup *make_exec_cleanup (make_cleanup_ftype *, void *); -extern struct cleanup *make_exec_error_cleanup (make_cleanup_ftype *, void *); +extern struct cleanup *make_my_cleanup2 (struct cleanup **, + make_cleanup_ftype *, void *, + void (*free_arg) (void *)); extern struct cleanup *save_cleanups (void); extern struct cleanup *save_final_cleanups (void); @@ -389,11 +376,13 @@ extern void free_current_contents (void *); extern void null_cleanup (void *); +extern struct cleanup *make_command_stats_cleanup (int); + extern int myread (int, char *, int); -extern int query (const char *, ...) ATTR_FORMAT (printf, 1, 2); -extern int nquery (const char *, ...) ATTR_FORMAT (printf, 1, 2); -extern int yquery (const char *, ...) ATTR_FORMAT (printf, 1, 2); +extern int query (const char *, ...) ATTRIBUTE_PRINTF (1, 2); +extern int nquery (const char *, ...) ATTRIBUTE_PRINTF (1, 2); +extern int yquery (const char *, ...) ATTRIBUTE_PRINTF (1, 2); extern void init_page_info (void); @@ -403,15 +392,26 @@ extern char *xfullpath (const char *); extern unsigned long gnu_debuglink_crc32 (unsigned long crc, unsigned char *buf, size_t len); -/* From demangle.c */ +ULONGEST strtoulst (const char *num, const char **trailer, int base); -extern void set_demangling_style (char *); +char *ldirname (const char *filename); + +char **gdb_buildargv (const char *); + +int compare_positive_ints (const void *ap, const void *bp); + +/* A wrapper for bfd_errmsg to produce a more helpful error message + in the case of bfd_error_file_ambiguously recognized. + MATCHING, if non-NULL, is the corresponding argument to + bfd_check_format_matches, and will be freed. */ + +extern const char *gdb_bfd_errmsg (bfd_error_type error_tag, char **matching); -/* From tm.h */ +extern int parse_pid_to_attach (char *args); -struct type; -typedef int (use_struct_convention_fn) (int gcc_p, struct type * value_type); -extern use_struct_convention_fn generic_use_struct_convention; +/* From demangle.c */ + +extern void set_demangling_style (char *); /* Annotation stuff. */ @@ -468,25 +468,25 @@ extern void puts_filtered_tabular (char *string, int width, int right); extern void puts_debug (char *prefix, char *string, char *suffix); -extern void vprintf_filtered (const char *, va_list) ATTR_FORMAT (printf, 1, 0); +extern void vprintf_filtered (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); -extern void vfprintf_filtered (struct ui_file *, const char *, va_list) ATTR_FORMAT (printf, 2, 0); +extern void vfprintf_filtered (struct ui_file *, const char *, va_list) ATTRIBUTE_PRINTF (2, 0); -extern void fprintf_filtered (struct ui_file *, const char *, ...) ATTR_FORMAT (printf, 2, 3); +extern void fprintf_filtered (struct ui_file *, const char *, ...) ATTRIBUTE_PRINTF (2, 3); -extern void fprintfi_filtered (int, struct ui_file *, const char *, ...) ATTR_FORMAT (printf, 3, 4); +extern void fprintfi_filtered (int, struct ui_file *, const char *, ...) ATTRIBUTE_PRINTF (3, 4); -extern void printf_filtered (const char *, ...) ATTR_FORMAT (printf, 1, 2); +extern void printf_filtered (const char *, ...) ATTRIBUTE_PRINTF (1, 2); -extern void printfi_filtered (int, const char *, ...) ATTR_FORMAT (printf, 2, 3); +extern void printfi_filtered (int, const char *, ...) ATTRIBUTE_PRINTF (2, 3); -extern void vprintf_unfiltered (const char *, va_list) ATTR_FORMAT (printf, 1, 0); +extern void vprintf_unfiltered (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); -extern void vfprintf_unfiltered (struct ui_file *, const char *, va_list) ATTR_FORMAT (printf, 2, 0); +extern void vfprintf_unfiltered (struct ui_file *, const char *, va_list) ATTRIBUTE_PRINTF (2, 0); -extern void fprintf_unfiltered (struct ui_file *, const char *, ...) ATTR_FORMAT (printf, 2, 3); +extern void fprintf_unfiltered (struct ui_file *, const char *, ...) ATTRIBUTE_PRINTF (2, 3); -extern void printf_unfiltered (const char *, ...) ATTR_FORMAT (printf, 1, 2); +extern void printf_unfiltered (const char *, ...) ATTRIBUTE_PRINTF (1, 2); extern void print_spaces (int, struct ui_file *); @@ -498,26 +498,30 @@ extern void fputstr_filtered (const char *str, int quotr, struct ui_file * strea extern void fputstr_unfiltered (const char *str, int quotr, struct ui_file * stream); +extern void fputstrn_filtered (const char *str, int n, int quotr, struct ui_file * stream); + extern void fputstrn_unfiltered (const char *str, int n, int quotr, struct ui_file * stream); /* Display the host ADDR on STREAM formatted as ``0x%x''. */ extern void gdb_print_host_address (const void *addr, struct ui_file *stream); -/* Convert a CORE_ADDR into a HEX string. paddr() is like %08lx. - paddr_nz() is like %lx. paddr_u() is like %lu. paddr_width() is - for ``%*''. */ -extern int strlen_paddr (void); -extern char *paddr (CORE_ADDR addr); -extern char *paddr_nz (CORE_ADDR addr); -extern char *paddr_u (CORE_ADDR addr); -extern char *paddr_d (LONGEST addr); +extern const char *host_address_to_string (const void *addr); + +/* Convert CORE_ADDR to string in platform-specific manner. + This is usually formatted similar to 0x%lx. */ +extern const char *paddress (struct gdbarch *gdbarch, CORE_ADDR addr); + +/* %d for LONGEST */ +extern char *plongest (LONGEST l); +/* %u for ULONGEST */ +extern char *pulongest (ULONGEST l); extern char *phex (ULONGEST l, int sizeof_l); extern char *phex_nz (ULONGEST l, int sizeof_l); extern char *int_string (LONGEST, int, int, int, int); -/* Like paddr() only print/scan raw CORE_ADDR. The output from - core_addr_to_string() can be passed direct to +/* Convert a CORE_ADDR into a HEX string with leading zeros. + The output from core_addr_to_string() can be passed direct to string_to_core_addr(). */ extern const char *core_addr_to_string (const CORE_ADDR addr); extern const char *core_addr_to_string_nz (const CORE_ADDR addr); @@ -531,7 +535,7 @@ extern char *hex_string_custom (LONGEST, int); extern void fprintf_symbol_filtered (struct ui_file *, char *, enum language, int); -extern NORETURN void perror_with_name (const char *) ATTR_NORETURN; +extern void perror_with_name (const char *) ATTRIBUTE_NORETURN; extern void print_sys_errmsg (const char *, int); @@ -548,11 +552,19 @@ extern void symbol_file_command (char *, int); /* Remote targets may wish to use this as their load function. */ extern void generic_load (char *name, int from_tty); -/* Summarise a download */ +/* Report on STREAM the performance of memory transfer operation, + such as 'load'. + DATA_COUNT is the number of bytes transferred. + WRITE_COUNT is the number of separate write operations, or 0, + if that information is not available. + START_TIME is the time at which an operation was started. + END_TIME is the time at which an operation ended. */ +struct timeval; extern void print_transfer_performance (struct ui_file *stream, unsigned long data_count, unsigned long write_count, - unsigned long time_count); + const struct timeval *start_time, + const struct timeval *end_time); /* From top.c */ @@ -574,12 +586,13 @@ extern int info_verbose; /* From printcmd.c */ -extern void set_next_address (CORE_ADDR); +extern void set_next_address (struct gdbarch *, CORE_ADDR); -extern void print_address_symbolic (CORE_ADDR, struct ui_file *, int, - char *); +extern void print_address_symbolic (struct gdbarch *, CORE_ADDR, + struct ui_file *, int, char *); -extern int build_address_symbolic (CORE_ADDR addr, +extern int build_address_symbolic (struct gdbarch *, + CORE_ADDR addr, int do_demangle, char **name, int *offset, @@ -587,18 +600,17 @@ extern int build_address_symbolic (CORE_ADDR addr, int *line, int *unmapped); -extern void print_address_numeric (CORE_ADDR, int, struct ui_file *); - -extern void print_address (CORE_ADDR, struct ui_file *); +extern void print_address (struct gdbarch *, CORE_ADDR, struct ui_file *); +extern const char *pc_prefix (CORE_ADDR); /* From source.c */ #define OPF_TRY_CWD_FIRST 0x01 #define OPF_SEARCH_IN_PATH 0x02 -extern int openp (const char *, int, const char *, int, int, char **); +extern int openp (const char *, int, const char *, int, char **); -extern int source_full_path_of (char *, char **); +extern int source_full_path_of (const char *, char **); extern void mod_path (char *, char **); @@ -606,18 +618,14 @@ extern void add_path (char *, char **, int); extern void directory_command (char *, int); +extern void directory_switch (char *, int); + extern char *source_path; extern void init_source_path (void); -extern void init_last_source_visited (void); - /* From exec.c */ -extern void exec_set_section_offsets (bfd_signed_vma text_off, - bfd_signed_vma data_off, - bfd_signed_vma bss_off); - /* Take over the 'find_mapped_memory' vector from exec.c. */ extern void exec_set_find_memory_regions (int (*) (int (*) (CORE_ADDR, unsigned long, @@ -639,7 +647,10 @@ enum lval_type /* In a gdb internal variable. */ lval_internalvar, /* Part of a gdb internal variable (structure field). */ - lval_internalvar_component + lval_internalvar_component, + /* Value's bits are fetched and stored using functions provided by + its creator. */ + lval_computed }; /* Control types for commands */ @@ -659,6 +670,9 @@ enum command_control_type continue_control, while_control, if_control, + commands_control, + python_control, + while_stepping_control, invalid_control }; @@ -670,52 +684,61 @@ struct command_line struct command_line *next; char *line; enum command_control_type control_type; + /* The number of elements in body_list. */ int body_count; + /* For composite commands, the nested lists of + commands. For example, for "if" command this + will contain the then branch and the else + branch, if that is available. */ struct command_line **body_list; }; -extern struct command_line *read_command_lines (char *, int); +extern struct command_line *read_command_lines (char *, int, int, + void (*)(char *, void *), + void *); +extern struct command_line *read_command_lines_1 (char * (*) (void), int, + void (*)(char *, void *), + void *); extern void free_command_lines (struct command_line **); /* To continue the execution commands when running gdb asynchronously. A continuation structure contains a pointer to a function to be called to finish the command, once the target has stopped. Such mechanism is - used bt the finish and until commands, and in the remote protocol + used by the finish and until commands, and in the remote protocol when opening an extended-remote connection. */ -struct continuation_arg - { - struct continuation_arg *next; - union continuation_data { - void *pointer; - int integer; - long longint; - } data; - }; +struct continuation; +struct thread_info; +struct inferior; -struct continuation - { - void (*continuation_hook) (struct continuation_arg *); - struct continuation_arg *arg_list; - struct continuation *next; - }; +/* From utils.c */ -/* In infrun.c. */ -extern struct continuation *cmd_continuation; -/* Used only by the step_1 function. */ -extern struct continuation *intermediate_continuation; +/* Thread specific continuations. */ -/* From utils.c */ -extern void add_continuation (void (*)(struct continuation_arg *), - struct continuation_arg *); +extern void add_continuation (struct thread_info *, + void (*)(void *), void *, + void (*)(void *)); extern void do_all_continuations (void); +extern void do_all_continuations_thread (struct thread_info *); extern void discard_all_continuations (void); +extern void discard_all_continuations_thread (struct thread_info *); -extern void add_intermediate_continuation (void (*)(struct continuation_arg *), - struct continuation_arg *); +extern void add_intermediate_continuation (struct thread_info *, + void (*)(void *), void *, + void (*)(void *)); extern void do_all_intermediate_continuations (void); +extern void do_all_intermediate_continuations_thread (struct thread_info *); extern void discard_all_intermediate_continuations (void); +extern void discard_all_intermediate_continuations_thread (struct thread_info *); + +/* Inferior specific (any thread) continuations. */ + +extern void add_inferior_continuation (void (*) (void *), + void *, + void (*) (void *)); +extern void do_all_inferior_continuations (void); +extern void discard_all_inferior_continuations (struct inferior *inf); /* String containing the current directory (what getwd would return). */ @@ -752,6 +775,7 @@ enum val_prettyprint ptid_get_lwp - Fetch the lwp component of a ptid. ptid_get_tid - Fetch the tid component of a ptid. ptid_equal - Test to see if two ptids are equal. + ptid_is_pid - Test to see if this ptid represents a process id. Please do NOT access the struct ptid members directly (except, of course, in the implementation of the above ptid manipulation @@ -773,14 +797,6 @@ typedef struct ptid ptid_t; -/* Optional host machine definition. Pure autoconf targets will not - need a "xm.h" file. This will be a symlink to one of the xm-*.h - files, built by the `configure' script. */ - -#ifdef GDB_XM_FILE -#include "xm.h" -#endif - /* Optional native machine support. Non-native (and possibly pure multi-arch) targets do not need a "nm.h" file. This will be a symlink to one of the nm-*.h files, built by the `configure' @@ -790,14 +806,6 @@ typedef struct ptid ptid_t; #include "nm.h" #endif -/* Optional target machine definition. Pure multi-arch configurations - do not need a "tm.h" file. This will be a symlink to one of the - tm-*.h files, built by the `configure' script. */ - -#ifdef GDB_TM_FILE -#include "tm.h" -#endif - /* Assume that fopen accepts the letter "b" in the mode string. It is demanded by ISO C9X, and should be supported on all platforms that claim to have a standard-conforming C library. On @@ -856,24 +864,33 @@ extern char *savestring (const char *, size_t); "libiberty.h". */ extern void xfree (void *); +/* Like xmalloc, but zero the memory. */ +extern void *xzalloc (size_t); + /* Utility macros to allocate typed memory. Avoids errors like: struct foo *foo = xmalloc (sizeof struct bar); and memset (foo, sizeof (struct foo), 0). */ -#define XZALLOC(TYPE) ((TYPE*) memset (xmalloc (sizeof (TYPE)), 0, sizeof (TYPE))) +#define XZALLOC(TYPE) ((TYPE*) xzalloc (sizeof (TYPE))) #define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE))) #define XCALLOC(NMEMB, TYPE) ((TYPE*) xcalloc ((NMEMB), sizeof (TYPE))) /* Like asprintf/vasprintf but get an internal_error if the call fails. */ -extern void xasprintf (char **ret, const char *format, ...) ATTR_FORMAT (printf, 2, 3); -extern void xvasprintf (char **ret, const char *format, va_list ap); +extern void xasprintf (char **ret, const char *format, ...) ATTRIBUTE_PRINTF (2, 3); +extern void xvasprintf (char **ret, const char *format, va_list ap) + ATTRIBUTE_PRINTF (2, 0); /* Like asprintf and vasprintf, but return the string, throw an error if no memory. */ -extern char *xstrprintf (const char *format, ...) ATTR_FORMAT (printf, 1, 2); -extern char *xstrvprintf (const char *format, va_list ap); +extern char *xstrprintf (const char *format, ...) ATTRIBUTE_PRINTF (1, 2); +extern char *xstrvprintf (const char *format, va_list ap) + ATTRIBUTE_PRINTF (1, 0); + +/* Like snprintf, but throw an error if the output buffer is too small. */ +extern int xsnprintf (char *str, size_t size, const char *format, ...) + ATTRIBUTE_PRINTF (3, 4); -extern int parse_escape (char **); +extern int parse_escape (struct gdbarch *, char **); /* Message to be printed before the error message, when an error occurs. */ @@ -887,33 +904,39 @@ extern char *quit_pre_print; extern char *warning_pre_print; -extern NORETURN void verror (const char *fmt, va_list ap) ATTR_NORETURN; +extern void verror (const char *fmt, va_list ap) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0); -extern NORETURN void error (const char *fmt, ...) ATTR_NORETURN ATTR_FORMAT (printf, 1, 2); +extern void error (const char *fmt, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); -extern NORETURN void error_stream (struct ui_file *) ATTR_NORETURN; +extern void error_stream (struct ui_file *) ATTRIBUTE_NORETURN; -extern NORETURN void vfatal (const char *fmt, va_list ap) ATTR_NORETURN; +extern void vfatal (const char *fmt, va_list ap) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0); -extern NORETURN void fatal (const char *fmt, ...) ATTR_NORETURN ATTR_FORMAT (printf, 1, 2); +extern void fatal (const char *fmt, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); -extern NORETURN void internal_verror (const char *file, int line, - const char *, va_list ap) ATTR_NORETURN; +extern void internal_verror (const char *file, int line, const char *, + va_list ap) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0); -extern NORETURN void internal_error (const char *file, int line, - const char *, ...) ATTR_NORETURN ATTR_FORMAT (printf, 3, 4); +extern void internal_error (const char *file, int line, const char *, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4); extern void internal_vwarning (const char *file, int line, - const char *, va_list ap); + const char *, va_list ap) + ATTRIBUTE_PRINTF (3, 0); extern void internal_warning (const char *file, int line, - const char *, ...) ATTR_FORMAT (printf, 3, 4); + const char *, ...) ATTRIBUTE_PRINTF (3, 4); -extern NORETURN void nomem (long) ATTR_NORETURN; +extern void nomem (long) ATTRIBUTE_NORETURN; -extern void warning (const char *, ...) ATTR_FORMAT (printf, 1, 2); +extern void warning (const char *, ...) ATTRIBUTE_PRINTF (1, 2); -extern void vwarning (const char *, va_list args); +extern void vwarning (const char *, va_list args) ATTRIBUTE_PRINTF (1, 0); /* List of known OS ABIs. If you change this, make sure to update the table in osabi.c. */ @@ -935,19 +958,16 @@ enum gdb_osabi GDB_OSABI_OPENBSD_ELF, GDB_OSABI_WINCE, GDB_OSABI_GO32, - GDB_OSABI_NETWARE, GDB_OSABI_IRIX, - GDB_OSABI_LYNXOS, GDB_OSABI_INTERIX, GDB_OSABI_HPUX_ELF, GDB_OSABI_HPUX_SOM, - - GDB_OSABI_ARM_EABI_V1, - GDB_OSABI_ARM_EABI_V2, - GDB_OSABI_ARM_APCS, GDB_OSABI_QNXNTO, - GDB_OSABI_CYGWIN, + GDB_OSABI_AIX, + GDB_OSABI_DICOS, + GDB_OSABI_DARWIN, + GDB_OSABI_SYMBIAN, GDB_OSABI_INVALID /* keep this last */ }; @@ -1004,7 +1024,7 @@ extern void *alloca (); /* Maximum size of a register. Something small, but large enough for all known ISAs. If it turns out to be too small, make it bigger. */ -enum { MAX_REGISTER_SIZE = 16 }; +enum { MAX_REGISTER_SIZE = 32 }; /* Static target-system-dependent parameters for GDB. */ @@ -1025,37 +1045,32 @@ enum { MAX_REGISTER_SIZE = 16 }; #define HOST_CHAR_BIT TARGET_CHAR_BIT #endif -/* The bit byte-order has to do just with numbering of bits in - debugging symbols and such. Conceptually, it's quite separate - from byte/word byte order. */ - -#if !defined (BITS_BIG_ENDIAN) -#define BITS_BIG_ENDIAN (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) -#endif - /* In findvar.c. */ -extern LONGEST extract_signed_integer (const void *, int); +extern LONGEST extract_signed_integer (const gdb_byte *, int, + enum bfd_endian); -extern ULONGEST extract_unsigned_integer (const void *, int); +extern ULONGEST extract_unsigned_integer (const gdb_byte *, int, + enum bfd_endian); -extern int extract_long_unsigned_integer (const void *, int, LONGEST *); +extern int extract_long_unsigned_integer (const gdb_byte *, int, + enum bfd_endian, LONGEST *); -extern CORE_ADDR extract_typed_address (const void *buf, struct type *type); +extern CORE_ADDR extract_typed_address (const gdb_byte *buf, + struct type *type); -extern void store_signed_integer (void *, int, LONGEST); +extern void store_signed_integer (gdb_byte *, int, + enum bfd_endian, LONGEST); -extern void store_unsigned_integer (void *, int, ULONGEST); +extern void store_unsigned_integer (gdb_byte *, int, + enum bfd_endian, ULONGEST); -extern void store_typed_address (void *buf, struct type *type, CORE_ADDR addr); +extern void store_typed_address (gdb_byte *buf, struct type *type, + CORE_ADDR addr); /* From valops.c */ -extern CORE_ADDR push_bytes (CORE_ADDR, char *, int); - -extern CORE_ADDR push_word (CORE_ADDR, ULONGEST); - extern int watchdog; /* Hooks for alternate command interfaces. */ @@ -1086,23 +1101,21 @@ extern void (*deprecated_show_load_progress) (const char *section, extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s, int line, int stopline, int noerror); -extern struct frame_info *parse_frame_specification (char *frame_exp); -extern int (*deprecated_query_hook) (const char *, va_list); -extern void (*deprecated_warning_hook) (const char *, va_list); +extern int (*deprecated_query_hook) (const char *, va_list) + ATTRIBUTE_FPTR_PRINTF(1,0); +extern void (*deprecated_warning_hook) (const char *, va_list) + ATTRIBUTE_FPTR_PRINTF(1,0); extern void (*deprecated_flush_hook) (struct ui_file * stream); -extern void (*deprecated_create_breakpoint_hook) (struct breakpoint * b); -extern void (*deprecated_delete_breakpoint_hook) (struct breakpoint * bpt); -extern void (*deprecated_modify_breakpoint_hook) (struct breakpoint * bpt); extern void (*deprecated_interactive_hook) (void); -extern void (*deprecated_registers_changed_hook) (void); -extern void (*deprecated_readline_begin_hook) (char *,...); +extern void (*deprecated_readline_begin_hook) (char *, ...) + ATTRIBUTE_FPTR_PRINTF_1; extern char *(*deprecated_readline_hook) (char *); extern void (*deprecated_readline_end_hook) (void); extern void (*deprecated_register_changed_hook) (int regno); -extern void (*deprecated_memory_changed_hook) (CORE_ADDR addr, int len); extern void (*deprecated_context_hook) (int); extern ptid_t (*deprecated_target_wait_hook) (ptid_t ptid, - struct target_waitstatus * status); + struct target_waitstatus *status, + int options); extern void (*deprecated_attach_hook) (void); extern void (*deprecated_detach_hook) (void); @@ -1111,8 +1124,6 @@ extern void (*deprecated_call_command_hook) (struct cmd_list_element * c, extern void (*deprecated_set_hook) (struct cmd_list_element * c); -extern void (*deprecated_error_hook) (void); - extern void (*deprecated_error_begin_hook) (void); extern int (*deprecated_ui_load_progress_hook) (const char *section, @@ -1123,9 +1134,9 @@ extern int (*deprecated_ui_load_progress_hook) (const char *section, extern int use_windows; -/* Symbolic definitions of filename-related things. */ -/* FIXME, this doesn't work very well if host and executable - filesystems conventions are different. */ +/* Definitions of filename-related things. */ + +/* Host specific things. */ #ifdef __MSDOS__ # define CANT_FORK @@ -1133,6 +1144,10 @@ extern int use_windows; # define DIRNAME_SEPARATOR ';' #endif +#if !defined (__CYGWIN__) && defined (_WIN32) +# define DIRNAME_SEPARATOR ';' +#endif + #ifndef DIRNAME_SEPARATOR #define DIRNAME_SEPARATOR ':' #endif @@ -1202,4 +1217,14 @@ extern int use_windows; extern ULONGEST align_up (ULONGEST v, int n); extern ULONGEST align_down (ULONGEST v, int n); +/* Allocation and deallocation functions for the libiberty hash table + which use obstacks. */ +void *hashtab_obstack_allocate (void *data, size_t size, size_t count); +void dummy_obstack_deallocate (void *object, void *data); + +/* From progspace.c */ + +extern void initialize_progspace (void); +extern void initialize_inferiors (void); + #endif /* #ifndef DEFS_H */