X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fada-lang.h;h=f5b3bca9e63cb73d8e52960e8b7dbf4a09cbaeea;hb=79a94a2ad1e6e2f227de07427481e4bb8be84504;hp=76dca3227be17028378861498cf08675604d2680;hpb=8e069a981cbb9b33ccfbdd82ad7da5ce8b0c35b2;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index 76dca3227b..f5b3bca9e6 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -1,7 +1,6 @@ /* Ada language support definitions for GDB, the GNU debugger. - Copyright (C) 1992, 1997-2005, 2007-2012 Free Software Foundation, - Inc. + Copyright (C) 1992-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -23,20 +22,19 @@ struct frame_info; struct inferior; +struct type_print_options; +struct parser_state; #include "value.h" #include "gdbtypes.h" #include "breakpoint.h" +#include "vec.h" /* Names of specific files known to be part of the runtime system and that might consider (confusing) debugging information. Each name (a basic regular expression string) is followed by a comma. FIXME: Should be part of a configuration file. */ -#if defined(__alpha__) && defined(__osf__) -#define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \ - "^[agis]-.*\\.ad[bs]$", \ - "/usr/shlib/libpthread\\.so", -#elif defined (__linux__) +#if defined (__linux__) #define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \ "^[agis]-.*\\.ad[bs]$", \ "/lib.*/libpthread\\.so[.0-9]*$", "/lib.*/libpthread\\.a$", \ @@ -45,6 +43,7 @@ struct inferior; #if !defined (ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS) #define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \ + "^unwind-seh.c$", \ "^[agis]-.*\\.ad[bs]$", #endif @@ -80,13 +79,6 @@ struct ada_opname_map /* Defined in ada-lang.c */ extern const struct ada_opname_map ada_opname_table[]; -/* A tuple, (symbol, block), representing one instance of a - * symbol-lookup operation. */ -struct ada_symbol_info { - struct symbol* sym; - struct block* block; -}; - /* Denotes a type of renaming symbol (see ada_parse_renaming). */ enum ada_renaming_category { @@ -109,6 +101,16 @@ enum ada_renaming_category ADA_SUBPROGRAM_RENAMING }; +/* The different types of catchpoints that we introduced for catching + Ada exceptions. */ + +enum ada_exception_catchpoint_kind +{ + ada_catch_exception, + ada_catch_exception_unhandled, + ada_catch_assert +}; + /* Ada task structures. */ struct ada_task_info @@ -145,29 +147,31 @@ struct ada_task_info least M objects, updating V and S as necessary. */ #define GROW_VECT(v, s, m) \ - if ((s) < (m)) (v) = grow_vect (v, &(s), m, sizeof *(v)); + if ((s) < (m)) (v) = (char *) grow_vect (v, &(s), m, sizeof *(v)); extern void *grow_vect (void *, size_t *, size_t, int); +extern void ada_ensure_varsize_limit (const struct type *type); + extern int ada_get_field_index (const struct type *type, const char *field_name, int maybe_missing); -extern int ada_parse (void); /* Defined in ada-exp.y */ +extern int ada_parse (struct parser_state *); /* Defined in ada-exp.y */ -extern void ada_error (char *); /* Defined in ada-exp.y */ +extern void ada_yyerror (const char *); /* Defined in ada-exp.y */ /* Defined in ada-typeprint.c */ extern void ada_print_type (struct type *, const char *, struct ui_file *, int, - int); + int, const struct type_print_options *); extern void ada_print_typedef (struct type *type, struct symbol *new_symbol, struct ui_file *stream); -extern int ada_val_print (struct type *, const gdb_byte *, int, CORE_ADDR, - struct ui_file *, int, - const struct value *, - const struct value_print_options *); +extern void ada_val_print (struct type *, int, CORE_ADDR, + struct ui_file *, int, + struct value *, + const struct value_print_options *); extern void ada_value_print (struct value *, struct ui_file *, const struct value_print_options *); @@ -214,34 +218,32 @@ extern struct value *ada_get_decoded_value (struct value *value); extern struct type *ada_get_decoded_type (struct type *type); -extern char *ada_decode_symbol (const struct general_symbol_info*); +extern const char *ada_decode_symbol (const struct general_symbol_info *); extern const char *ada_decode (const char*); extern enum language ada_update_initial_language (enum language); -extern void clear_ada_sym_cache (void); - extern int ada_lookup_symbol_list (const char *, const struct block *, - domain_enum, struct ada_symbol_info**, - int); + domain_enum, struct block_symbol**); extern char *ada_fold_name (const char *); -extern struct symbol *ada_lookup_symbol (const char *, const struct block *, - domain_enum, int *); +extern struct block_symbol ada_lookup_symbol (const char *, + const struct block *, + domain_enum, int *); -extern struct symbol * -ada_lookup_encoded_symbol (const char *, const struct block *, - domain_enum namespace, struct block **); +extern void ada_lookup_encoded_symbol + (const char *name, const struct block *block, domain_enum domain, + struct block_symbol *symbol_info); -extern struct minimal_symbol *ada_lookup_simple_minsym (const char *); +extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *); extern void ada_fill_in_ada_prototype (struct symbol *); -extern int user_select_syms (struct ada_symbol_info *, int, int); +extern int user_select_syms (struct block_symbol *, int, int); -extern int get_selections (int *, int, int, int, char *); +extern int get_selections (int *, int, int, int, const char *); extern int ada_scan_number (const char *, int, LONGEST *, int *); @@ -272,6 +274,8 @@ extern struct value *ada_value_tag (struct value *); extern const char *ada_tag_name (struct value *); +extern struct value *ada_tag_value_at_base_address (struct value *obj); + extern int ada_is_parent_field (struct type *, int); extern int ada_is_wrapper_field (struct type *, int); @@ -284,9 +288,9 @@ extern int ada_is_others_clause (struct type *, int); extern int ada_in_variant (LONGEST, struct type *, int); -extern char *ada_variant_discrim_name (struct type *); +extern const char *ada_variant_discrim_name (struct type *); -extern struct value *ada_value_struct_elt (struct value *, char *, int); +extern struct value *ada_value_struct_elt (struct value *, const char *, int); extern int ada_is_aligner_type (struct type *); @@ -331,10 +335,10 @@ extern const char *ada_type_name (struct type *); extern struct type *ada_find_parallel_type (struct type *, const char *suffix); -extern LONGEST get_int_var_value (char *, int *); +extern bool get_int_var_value (const char *, LONGEST &value); extern struct symbol *ada_find_renaming_symbol (struct symbol *name_sym, - struct block *block); + const struct block *block); extern int ada_prefer_type (struct type *, struct type *); @@ -366,7 +370,27 @@ extern char *ada_breakpoint_rewrite (char *, int *); extern char *ada_main_name (void); -extern char *ada_name_for_lookup (const char *name); +extern std::string ada_name_for_lookup (const char *name); + +extern void create_ada_exception_catchpoint + (struct gdbarch *gdbarch, enum ada_exception_catchpoint_kind ex_kind, + char *excep_string, char *cond_string, int tempflag, int disabled, + int from_tty); + +/* Some information about a given Ada exception. */ + +typedef struct ada_exc_info +{ + /* The name of the exception. */ + const char *name; + + /* The address of the symbol corresponding to that exception. */ + CORE_ADDR addr; +} ada_exc_info; + +DEF_VEC_O(ada_exc_info); + +extern VEC(ada_exc_info) *ada_exceptions_list (const char *regexp); /* Tasking-related: ada-tasks.c */