Merge GDB 7.5.1

gdb/ada-lang.h

 /* Ada language support definitions for GDB, the GNU debugger.
 
    Copyright (C) 1992, 1997-2005, 2007-2012 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 3 of the License, or
@@ skipping 62 matching lines @@
 {
   const char *encoded;
   const char *decoded;
   enum exp_opcode op;
 };
 
 /* Table of Ada operators in encoded and decoded forms.  */
 /* 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;
+/* A tuple representing one instance of a symbol-lookup operation.  */
+
+struct ada_symbol_info
+{
+  /* The symbol that was found.  */
+  struct symbol *sym;
+
+  /* The block where the symbol was found.  */
+  struct block *block;
 };
 
 /* Denotes a type of renaming symbol (see ada_parse_renaming).  */
 enum ada_renaming_category
   {
     /* Indicates a symbol that does not encode a renaming.  */
     ADA_NOT_RENAMING,
 
     /* For symbols declared
          Foo : TYPE renamed OBJECT;  */
@@ skipping 59 matching lines @@
 
 extern void ada_error (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);
 
 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 *, const gdb_byte *, int, CORE_ADDR,
+                           struct ui_file *, int,
+                           const struct value *,
+                           const struct value_print_options *);
 
-extern int ada_value_print (struct value *, struct ui_file *,
-                            const struct value_print_options *);
+extern void ada_value_print (struct value *, struct ui_file *,
+                             const struct value_print_options *);
 
                                 /* Defined in ada-lang.c */
 
 extern void ada_emit_char (int, struct type *, struct ui_file *, int, int);
 
 extern void ada_printchar (int, struct type *, struct ui_file *);
 
 extern void ada_printstr (struct ui_file *, struct type *, const gdb_byte *,
                           unsigned int, const char *, int,
                           const struct value_print_options *);
@@ skipping 19 matching lines @@
 extern int ada_is_simple_array_type (struct type *);
 
 extern int ada_is_array_descriptor_type (struct type *);
 
 extern int ada_is_bogus_array_descriptor (struct type *);
 
 extern LONGEST ada_discrete_type_low_bound (struct type *);
 
 extern LONGEST ada_discrete_type_high_bound (struct type *);
 
+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 (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**);
+                                   domain_enum, struct ada_symbol_info**,
+                                   int);
 
 extern char *ada_fold_name (const char *);
 
 extern struct 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 namespace,
+   struct ada_symbol_info *symbol_info);
 
 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 ada_symbol_info *, int, int);
 
 extern int get_selections (int *, int, int, int, char *);
 
 extern int ada_scan_number (const char *, int, LONGEST *, int *);
@@ skipping 72 matching lines @@
 extern struct value *ada_to_fixed_value (struct value *val);
 
 extern struct type *ada_template_to_fixed_record_type_1 (struct type *type,
                                                          const gdb_byte *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 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 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,
+extern struct symbol *ada_find_renaming_symbol (struct symbol *name_sym,
                                                 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_check_typedef (struct type *);
 
 extern char *ada_encode (const char *);
 
@@ skipping 31 matching lines @@
 extern void iterate_over_live_ada_tasks
   (ada_task_list_iterator_ftype *iterator);
 
 extern int ada_build_task_list (void);
 
 extern void print_ada_task_info (struct ui_out *uiout,
                                  char *taskno_str,
                                  struct inferior *inf);
 
 #endif