ada-exp.y: Synchronize with current ACT sources.

ada-lang.c: Ditto.
ada-lang.h: Ditto.
ada-lex.l: Ditto.
ada-tasks.c: Ditto.
ada-typeprint.c: Ditto.
ada-valprint.c: Ditto.

1 files changed, 171 insertions, 167 deletions

diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 54e56bb..0ec47b4 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -1,5 +1,6 @@
 /* Ada language support definitions for GDB, the GNU debugger.
-   Copyright 1992, 1997 Free Software Foundation, Inc.
+   Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -24,130 +25,103 @@ struct partial_symbol;
 
 #include "value.h"
 #include "gdbtypes.h"
+#include "breakpoint.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__) && !defined(VXWORKS_TARGET)
+#define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \
+   "^[agis]-.*\\.ad[bs]$", \
+   "/usr/shlib/libpthread\\.so",
+#elif defined (__linux__)
+#define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \
+   "^[agis]-.*\\.ad[bs]$", \
+   "/lib.*/libpthread\\.so[.0-9]*$", "/lib.*/libpthread\\.a$", \
+   "/lib.*/libc\\.so[.0-9]*$", "/lib.*/libc\\.a$",
+#endif
 
-struct block;
+#if !defined (ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS)
+#define ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS \
+   "^[agis]-.*\\.ad[bs]$",
+#endif
+
+/* Names of compiler-generated auxiliary functions probably of no
+   interest to users. Each name (a basic regular expression string)
+   is followed by a comma. */
+#define ADA_KNOWN_AUXILIARY_FUNCTION_NAME_PATTERNS \
+   "___clean[.a-zA-Z0-9_]*$",
 
-/* A macro to reorder the bytes of an address depending on the
-   endiannes of the target.  */
-#define EXTRACT_ADDRESS(x) ((void *) extract_unsigned_integer (&(x), sizeof (x)))
-/* A macro to reorder the bytes of an int depending on the endiannes
-   of the target */
-#define EXTRACT_INT(x) ((int) extract_signed_integer (&(x), sizeof (x)))
+/* The maximum number of frame levels searched for non-local,
+ * non-global symbols.  This limit exists as a precaution to prevent
+ * infinite search loops when the stack is screwed up. */
+#define MAX_ENCLOSING_FRAME_LEVELS 7
 
-/* Chain of cleanups for arguments of OP_UNRESOLVED_VALUE names.  Created in
-   yyparse and freed in ada_resolve. */
-extern struct cleanup *unresolved_names;
+/* Maximum number of steps followed in looking for the ultimate
+   referent of a renaming.  This prevents certain infinite loops that
+   can otherwise result. */
+#define MAX_RENAMING_CHAIN_LENGTH 10
 
-/* Corresponding mangled/demangled names and opcodes for Ada user-definable 
+struct block;
+
+/* Corresponding encoded/decoded names and opcodes for Ada user-definable
    operators. */
 struct ada_opname_map
 {
-  const char *mangled;
-  const char *demangled;
+  const char *encoded;
+  const char *decoded;
   enum exp_opcode op;
 };
 
-/* Table of Ada operators in mangled and demangled forms. */
+/* Table of Ada operators in encoded and decoded forms. */
 /* Defined in ada-lang.c */
 extern const struct ada_opname_map ada_opname_table[];
 
-/* The maximum number of tasks known to the Ada runtime */
-extern const int MAX_NUMBER_OF_KNOWN_TASKS;
-
-/* Identifiers for Ada attributes that need special processing.  Be sure 
-   to update the table attribute_names in ada-lang.c whenever you change this.
-   */
-
-enum ada_attribute
-{
-  /* Invalid attribute for error checking. */
-  ATR_INVALID,
-
-  ATR_FIRST,
-  ATR_LAST,
-  ATR_LENGTH,
-  ATR_IMAGE,
-  ATR_IMG,
-  ATR_MAX,
-  ATR_MIN,
-  ATR_MODULUS,
-  ATR_POS,
-  ATR_SIZE,
-  ATR_TAG,
-  ATR_VAL,
-
-  /* Dummy last attribute. */
-  ATR_END
-};
-
-enum task_states
-{
-  Unactivated,
-  Runnable,
-  Terminated,
-  Activator_Sleep,
-  Acceptor_Sleep,
-  Entry_Caller_Sleep,
-  Async_Select_Sleep,
-  Delay_Sleep,
-  Master_Completion_Sleep,
-  Master_Phase_2_Sleep
-};
-
-extern char *ada_task_states[];
-
-typedef struct
-{
-  char *P_ARRAY;
-  int *P_BOUNDS;
-}
-fat_string;
-
-typedef struct entry_call
-{
-  void *self;
-}
- *entry_call_link;
-
-struct task_fields
-{
-  int entry_num;
-#if (defined (VXWORKS_TARGET) || !defined (i386)) \
-    && !(defined (VXWORKS_TARGET) && defined (M68K_TARGET))
-  int pad1;
-#endif
-  char state;
-#if (defined (VXWORKS_TARGET) && defined (M68K_TARGET))
-  char pad_8bits;
-#endif
-  void *parent;
-  int priority;
-  int current_priority;
-  fat_string image;
-  entry_call_link call;
-#if (defined (sun) && defined (__SVR4)) && !defined (VXWORKS_TARGET)
-  int pad2;
-  unsigned thread;
-  unsigned lwp;
-#else
-  void *thread;
-  void *lwp;
-#endif
-}
-#if (defined (VXWORKS_TARGET) && defined (M68K_TARGET))
-__attribute__ ((packed))
-#endif
-  ;
-
-struct task_entry
-{
-  void *task_id;
-  int task_num;
-  int known_tasks_index;
-  struct task_entry *next_task;
-  void *thread;
-  void *lwp;
-  int stack_per;
+enum ada_operator 
+  {
+    /* X IN A'RANGE(N).  N is an immediate operand, surrounded by 
+       BINOP_IN_BOUNDS before and after.  A is an array, X an index 
+       value.  Evaluates to true iff X is within range of the Nth
+       dimension (1-based) of A.  (A multi-dimensional array
+       type is represented as array of array of ...) */
+    BINOP_IN_BOUNDS = OP_EXTENDED0,
+
+    /* X IN L .. U.  True iff L <= X <= U.  */
+    TERNOP_IN_RANGE,
+
+    /* Ada attributes ('Foo). */
+    OP_ATR_FIRST,
+    OP_ATR_LAST,
+    OP_ATR_LENGTH,
+    OP_ATR_IMAGE,
+    OP_ATR_MAX,
+    OP_ATR_MIN,
+    OP_ATR_MODULUS,
+    OP_ATR_POS,
+    OP_ATR_SIZE,
+    OP_ATR_TAG,
+    OP_ATR_VAL,
+
+    /* Ada type qualification.  It is encoded as for UNOP_CAST, above, 
+       and denotes the TYPE'(EXPR) construct. */
+    UNOP_QUAL,
+
+    /* X IN TYPE.  The `TYPE' argument is immediate, with 
+       UNOP_IN_RANGE before and after it. True iff X is a member of 
+       type TYPE (typically a subrange). */
+    UNOP_IN_RANGE,
+
+    /* End marker */
+    OP_ADA_LAST
+  };
+
+/* A triple, (symbol, block, symtab), representing one instance of a 
+ * symbol-lookup operation. */
+struct ada_symbol_info {
+  struct symbol* sym;
+  struct block* block;
+  struct symtab* symtab;
 };
 
 extern struct type *builtin_type_ada_int;
@@ -162,33 +136,40 @@ extern struct type *builtin_type_ada_natural;
 extern struct type *builtin_type_ada_positive;
 extern struct type *builtin_type_ada_system_address;
 
-/* Assuming V points to an array of S objects,  make sure that it contains at 
+/* The maximum number of tasks known to the Ada runtime */
+extern const int MAX_NUMBER_OF_KNOWN_TASKS;
+
+/* Assuming V points to an array of S objects,  make sure that it contains at
    least M objects, updating V and S as necessary. */
 
-#define GROW_VECT(v, s, m) 						\
+#define GROW_VECT(v, s, m)                                              \
    if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v)));
 
 extern void grow_vect (void **, size_t *, size_t, int);
 
-extern int ada_parse (void);	/* Defined in ada-exp.y */
+extern int ada_get_field_index (const struct type *type,
+                                const char *field_name,
+                                int maybe_missing);
 
-extern void ada_error (char *);	/* Defined in ada-exp.y */
+extern int ada_parse (void);    /* Defined in ada-exp.y */
 
-			/* Defined in ada-typeprint.c */
+extern void ada_error (char *); /* Defined in ada-exp.y */
+
+                        /* Defined in ada-typeprint.c */
 extern void ada_print_type (struct type *, char *, struct ui_file *, int,
-			    int);
+                            int);
 
 extern int ada_val_print (struct type *, char *, int, CORE_ADDR,
-			  struct ui_file *, int, int, int,
-			  enum val_prettyprint);
+                          struct ui_file *, int, int, int,
+                          enum val_prettyprint);
 
 extern int ada_value_print (struct value *, struct ui_file *, int,
-			    enum val_prettyprint);
+                            enum val_prettyprint);
 
-				/* Defined in ada-lang.c */
+                                /* Defined in ada-lang.c */
 
 extern struct value *value_from_contents_and_address (struct type *, char *,
-						      CORE_ADDR);
+                                                      CORE_ADDR);
 
 extern void ada_emit_char (int, struct ui_file *, int, int);
 
@@ -197,10 +178,10 @@ extern void ada_printchar (int, struct ui_file *);
 extern void ada_printstr (struct ui_file *, char *, unsigned int, int, int);
 
 extern void ada_convert_actuals (struct value *, int, struct value **,
-				 CORE_ADDR *);
+                                 CORE_ADDR *);
 
 extern struct value *ada_value_subscript (struct value *, int,
-					  struct value **);
+                                          struct value **);
 
 extern struct type *ada_array_element_type (struct type *, int);
 
@@ -208,13 +189,11 @@ extern int ada_array_arity (struct type *);
 
 struct type *ada_type_of_array (struct value *, int);
 
-extern struct value *ada_coerce_to_simple_array (struct value *);
-
 extern struct value *ada_coerce_to_simple_array_ptr (struct value *);
 
-extern int ada_is_simple_array (struct type *);
+extern int ada_is_simple_array_type (struct type *);
 
-extern int ada_is_array_descriptor (struct type *);
+extern int ada_is_array_descriptor_type (struct type *);
 
 extern int ada_is_bogus_array_descriptor (struct type *);
 
@@ -222,34 +201,43 @@ extern struct type *ada_index_type (struct type *, int);
 
 extern struct value *ada_array_bound (struct value *, int, int);
 
-extern int ada_lookup_symbol_list (const char *, struct block *,
-				   domain_enum, struct symbol ***,
-				   struct block ***);
+extern char *ada_decode_symbol (const struct general_symbol_info*);
 
-extern char *ada_fold_name (const char *);
+extern const char *ada_decode (const char*);
 
-extern struct symbol *ada_lookup_symbol (const char *, struct block *,
-					 domain_enum);
+extern enum language ada_update_initial_language (enum language, 
+						  struct partial_symtab*);
 
-extern struct minimal_symbol *ada_lookup_minimal_symbol (const char *);
+extern void clear_ada_sym_cache (void);
 
-extern void ada_resolve (struct expression **, struct type *);
+extern char **ada_make_symbol_completion_list (const char *text0,
+                                               const char *word);
 
-extern int ada_resolve_function (struct symbol **, struct block **, int,
-				 struct value **, int, const char *,
-				 struct type *);
+extern int ada_lookup_symbol_list (const char *, const struct block *,
+                                   domain_enum, struct ada_symbol_info**);
+
+extern char *ada_fold_name (const char *);
+
+extern struct symbol *ada_lookup_symbol (const char *, const struct block *,
+                                         domain_enum, int *, 
+					 struct symtab **);
+
+extern struct minimal_symbol *ada_lookup_simple_minsym (const char *);
 
 extern void ada_fill_in_ada_prototype (struct symbol *);
 
-extern int user_select_syms (struct symbol **, struct block **, int, int);
+extern int user_select_syms (struct ada_symbol_info *, int, int);
 
 extern int get_selections (int *, int, int, int, char *);
 
 extern char *ada_start_decode_line_1 (char *);
 
 extern struct symtabs_and_lines ada_finish_decode_line_1 (char **,
-							  struct symtab *,
-							  int, char ***);
+                                                          struct symtab *,
+                                                          int, char ***);
+
+extern struct symtabs_and_lines ada_sals_for_line (const char*, int,
+						   int, char***, int);
 
 extern int ada_scan_number (const char *, int, LONGEST *, int *);
 
@@ -260,8 +248,8 @@ extern int ada_is_ignored_field (struct type *, int);
 extern int ada_is_packed_array_type (struct type *);
 
 extern struct value *ada_value_primitive_packed_val (struct value *, char *,
-						     long, int, int,
-						     struct type *);
+                                                     long, int, int,
+                                                     struct type *);
 
 extern struct type *ada_coerce_to_simple_array_type (struct type *);
 
@@ -269,12 +257,16 @@ extern int ada_is_character_type (struct type *);
 
 extern int ada_is_string_type (struct type *);
 
-extern int ada_is_tagged_type (struct type *);
+extern int ada_is_tagged_type (struct type *, int);
+
+extern int ada_is_tag_type (struct type *);
 
 extern struct type *ada_tag_type (struct value *);
 
 extern struct value *ada_value_tag (struct value *);
 
+extern const char *ada_tag_name (struct value *);
+
 extern int ada_is_parent_field (struct type *, int);
 
 extern int ada_is_wrapper_field (struct type *, int);
@@ -289,24 +281,20 @@ extern int ada_in_variant (LONGEST, struct type *, int);
 
 extern char *ada_variant_discrim_name (struct type *);
 
-extern struct type *ada_lookup_struct_elt_type (struct type *, char *, int,
-						int *);
-
 extern struct value *ada_value_struct_elt (struct value *, char *, char *);
 
-extern struct value *ada_search_struct_field (char *, struct value *, int,
-					      struct type *);
-
 extern int ada_is_aligner_type (struct type *);
 
 extern struct type *ada_aligned_type (struct type *);
 
 extern char *ada_aligned_value_addr (struct type *, char *);
 
-extern const char *ada_attribute_name (int);
+extern const char *ada_attribute_name (enum exp_opcode);
 
 extern int ada_is_fixed_point_type (struct type *);
 
+extern int ada_is_system_address_type (struct type *);
+
 extern DOUBLEST ada_delta (struct type *);
 
 extern DOUBLEST ada_fixed_to_float (struct type *, LONGEST);
@@ -323,30 +311,37 @@ extern struct type *ada_system_address_type (void);
 
 extern int ada_which_variant_applies (struct type *, struct type *, char *);
 
-extern struct value *ada_to_fixed_value (struct type *, char *, CORE_ADDR,
-					 struct value *);
-
 extern struct type *ada_to_fixed_type (struct type *, char *, CORE_ADDR,
-				       struct value *);
+                                       struct value *);
+
+extern struct type *
+  ada_template_to_fixed_record_type_1 (struct type *type, char *valaddr,
+                                       CORE_ADDR address, struct value *dval0,
+                                       int keep_dynamic_fields);
 
 extern int ada_name_prefix_len (const char *);
 
 extern char *ada_type_name (struct type *);
 
 extern struct type *ada_find_parallel_type (struct type *,
-					    const char *suffix);
+                                            const char *suffix);
+
+extern LONGEST get_int_var_value (char *, int *);
 
-extern LONGEST get_int_var_value (char *, char *, int *);
+extern struct symbol *ada_find_any_symbol (const char *name);
 
 extern struct type *ada_find_any_type (const char *name);
 
+extern struct symbol *ada_find_renaming_symbol (const char *name,
+                                                struct block *block);
+
 extern int ada_prefer_type (struct type *, struct type *);
 
 extern struct type *ada_get_base_type (struct type *);
 
 extern struct type *ada_completed_type (struct type *);
 
-extern char *ada_mangle (const char *);
+extern char *ada_encode (const char *);
 
 extern const char *ada_enum_name (const char *);
 
@@ -364,29 +359,38 @@ extern const char *ada_renaming_type (struct type *);
 
 extern int ada_is_object_renaming (struct symbol *);
 
-extern const char *ada_simple_renamed_entity (struct symbol *);
+extern char *ada_simple_renamed_entity (struct symbol *);
 
 extern char *ada_breakpoint_rewrite (char *, int *);
 
+extern char *ada_main_name (void);
+
 /* Tasking-related: ada-tasks.c */
 
 extern int valid_task_id (int);
 
-extern int get_current_task (void);
-
 extern void init_task_list (void);
 
-extern void *get_self_id (void);
+extern int ada_is_exception_breakpoint (bpstat bs);
+
+extern void ada_adjust_exception_stop (bpstat bs);
 
-extern int get_current_task (void);
+extern void ada_print_exception_stop (bpstat bs);
 
-extern int get_entry_number (void *);
+extern int ada_get_current_task (ptid_t);
 
-extern void ada_report_exception_break (struct breakpoint *);
+extern int breakpoint_ada_task_match (CORE_ADDR, ptid_t);
+
+extern int ada_print_exception_breakpoint_nontask (struct breakpoint *);
+
+extern void ada_print_exception_breakpoint_task (struct breakpoint *);
 
 extern int ada_maybe_exception_partial_symbol (struct partial_symbol *sym);
 
 extern int ada_is_exception_sym (struct symbol *sym);
 
+extern void ada_find_printable_frame (struct frame_info *fi);
+
+extern void ada_reset_thread_registers (void);
 
 #endif