diff options
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 5945 |
1 files changed, 2822 insertions, 3123 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index db1d7d4..c58d463 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <stdio.h> -#include <string.h> +#include "gdb_string.h" #include <ctype.h> #include <stdarg.h> #include "demangle.h" @@ -40,153 +40,165 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "ui-out.h" #endif -struct cleanup* unresolved_names; +struct cleanup *unresolved_names; void extract_string (CORE_ADDR addr, char *buf); -static struct type * ada_create_fundamental_type (struct objfile *, int); +static struct type *ada_create_fundamental_type (struct objfile *, int); static void modify_general_field (char *, LONGEST, int, int); -static struct type* desc_base_type (struct type*); +static struct type *desc_base_type (struct type *); -static struct type* desc_bounds_type (struct type*); +static struct type *desc_bounds_type (struct type *); -static struct value* desc_bounds (struct value*); +static struct value *desc_bounds (struct value *); -static int fat_pntr_bounds_bitpos (struct type*); +static int fat_pntr_bounds_bitpos (struct type *); -static int fat_pntr_bounds_bitsize (struct type*); +static int fat_pntr_bounds_bitsize (struct type *); -static struct type* desc_data_type (struct type*); +static struct type *desc_data_type (struct type *); -static struct value* desc_data (struct value*); +static struct value *desc_data (struct value *); -static int fat_pntr_data_bitpos (struct type*); +static int fat_pntr_data_bitpos (struct type *); -static int fat_pntr_data_bitsize (struct type*); +static int fat_pntr_data_bitsize (struct type *); -static struct value* desc_one_bound (struct value*, int, int); +static struct value *desc_one_bound (struct value *, int, int); -static int desc_bound_bitpos (struct type*, int, int); +static int desc_bound_bitpos (struct type *, int, int); -static int desc_bound_bitsize (struct type*, int, int); +static int desc_bound_bitsize (struct type *, int, int); -static struct type* desc_index_type (struct type*, int); +static struct type *desc_index_type (struct type *, int); -static int desc_arity (struct type*); +static int desc_arity (struct type *); -static int ada_type_match (struct type*, struct type*, int); +static int ada_type_match (struct type *, struct type *, int); -static int ada_args_match (struct symbol*, struct value**, int); +static int ada_args_match (struct symbol *, struct value **, int); -static struct value* place_on_stack (struct value*, CORE_ADDR*); +static struct value *place_on_stack (struct value *, CORE_ADDR *); -static struct value* convert_actual (struct value*, struct type*, CORE_ADDR*); +static struct value *convert_actual (struct value *, struct type *, + CORE_ADDR *); -static struct value* make_array_descriptor (struct type*, struct value*, CORE_ADDR*); +static struct value *make_array_descriptor (struct type *, struct value *, + CORE_ADDR *); -static void ada_add_block_symbols (struct block*, const char*, - namespace_enum, struct objfile*, int); +static void ada_add_block_symbols (struct block *, const char *, + namespace_enum, struct objfile *, int); -static void fill_in_ada_prototype (struct symbol*); +static void fill_in_ada_prototype (struct symbol *); -static int is_nonfunction (struct symbol**, int); +static int is_nonfunction (struct symbol **, int); -static void add_defn_to_vec (struct symbol*, struct block*); +static void add_defn_to_vec (struct symbol *, struct block *); -static struct partial_symbol* -ada_lookup_partial_symbol (struct partial_symtab*, const char*, - int, namespace_enum, int); +static struct partial_symbol *ada_lookup_partial_symbol (struct partial_symtab + *, const char *, int, + namespace_enum, int); -static struct symtab* symtab_for_sym (struct symbol*); +static struct symtab *symtab_for_sym (struct symbol *); -static struct value* ada_resolve_subexp (struct expression**, int*, int, struct type*); +static struct value *ada_resolve_subexp (struct expression **, int *, int, + struct type *); -static void replace_operator_with_call (struct expression**, int, int, int, - struct symbol*, struct block*); +static void replace_operator_with_call (struct expression **, int, int, int, + struct symbol *, struct block *); -static int possible_user_operator_p (enum exp_opcode, struct value**); +static int possible_user_operator_p (enum exp_opcode, struct value **); -static const char* ada_op_name (enum exp_opcode); +static const char *ada_op_name (enum exp_opcode); -static int numeric_type_p (struct type*); +static int numeric_type_p (struct type *); -static int integer_type_p (struct type*); +static int integer_type_p (struct type *); -static int scalar_type_p (struct type*); +static int scalar_type_p (struct type *); -static int discrete_type_p (struct type*); +static int discrete_type_p (struct type *); -static char* extended_canonical_line_spec (struct symtab_and_line, const char*); +static char *extended_canonical_line_spec (struct symtab_and_line, + const char *); -static struct value* evaluate_subexp (struct type*, struct expression*, int*, enum noside); +static struct value *evaluate_subexp (struct type *, struct expression *, + int *, enum noside); -static struct value* evaluate_subexp_type (struct expression*, int*); +static struct value *evaluate_subexp_type (struct expression *, int *); -static struct type * ada_create_fundamental_type (struct objfile*, int); +static struct type *ada_create_fundamental_type (struct objfile *, int); -static int is_dynamic_field (struct type *, int); +static int is_dynamic_field (struct type *, int); -static struct type* -to_fixed_variant_branch_type (struct type*, char*, CORE_ADDR, struct value*); +static struct type *to_fixed_variant_branch_type (struct type *, char *, + CORE_ADDR, struct value *); -static struct type* to_fixed_range_type (char*, struct value*, struct objfile*); +static struct type *to_fixed_range_type (char *, struct value *, + struct objfile *); -static struct type* to_static_fixed_type (struct type*); +static struct type *to_static_fixed_type (struct type *); -static struct value* unwrap_value (struct value*); +static struct value *unwrap_value (struct value *); -static struct type* packed_array_type (struct type*, long*); +static struct type *packed_array_type (struct type *, long *); -static struct type* decode_packed_array_type (struct type*); +static struct type *decode_packed_array_type (struct type *); -static struct value* decode_packed_array (struct value*); +static struct value *decode_packed_array (struct value *); -static struct value* value_subscript_packed (struct value*, int, struct value**); +static struct value *value_subscript_packed (struct value *, int, + struct value **); -static struct value* coerce_unspec_val_to_type (struct value*, long, struct type*); +static struct value *coerce_unspec_val_to_type (struct value *, long, + struct type *); -static struct value* get_var_value (char*, char*); +static struct value *get_var_value (char *, char *); -static int lesseq_defined_than (struct symbol*, struct symbol*); +static int lesseq_defined_than (struct symbol *, struct symbol *); -static int equiv_types (struct type*, struct type*); +static int equiv_types (struct type *, struct type *); -static int is_name_suffix (const char*); +static int is_name_suffix (const char *); -static int wild_match (const char*, int, const char*); +static int wild_match (const char *, int, const char *); -static struct symtabs_and_lines find_sal_from_funcs_and_line (const char*, int, struct symbol**, int); +static struct symtabs_and_lines find_sal_from_funcs_and_line (const char *, + int, + struct symbol + **, int); -static int -find_line_in_linetable (struct linetable*, int, struct symbol**, int, int*); +static int find_line_in_linetable (struct linetable *, int, struct symbol **, + int, int *); -static int find_next_line_in_linetable (struct linetable*, int, int, int); +static int find_next_line_in_linetable (struct linetable *, int, int, int); -static struct symtabs_and_lines all_sals_for_line (const char*, int, char***); +static struct symtabs_and_lines all_sals_for_line (const char *, int, + char ***); -static void read_all_symtabs (const char*); +static void read_all_symtabs (const char *); -static int is_plausible_func_for_line (struct symbol*, int); +static int is_plausible_func_for_line (struct symbol *, int); -static struct value* ada_coerce_ref (struct value*); +static struct value *ada_coerce_ref (struct value *); -static struct value* value_pos_atr (struct value*); +static struct value *value_pos_atr (struct value *); -static struct value* value_val_atr (struct type*, struct value*); +static struct value *value_val_atr (struct type *, struct value *); -static struct symbol* standard_lookup (const char*, namespace_enum); +static struct symbol *standard_lookup (const char *, namespace_enum); extern void markTimeStart (int index); extern void markTimeStop (int index); - + /* Maximum-sized dynamic type. */ static unsigned int varsize_limit; -static const char* ada_completer_word_break_characters = +static const char *ada_completer_word_break_characters = " \t\n!@#$%^&*()+=|~`}{[]\";:?/,-"; /* The name of the symbol to use to get the name of the main subprogram */ @@ -202,18 +214,17 @@ static const char* ada_completer_word_break_characters = void extract_string (CORE_ADDR addr, char *buf) { - int char_index = 0; + int char_index = 0; - /* Loop, reading one byte at a time, until we reach the '\000' - end-of-string marker */ - do - { - target_read_memory (addr + char_index * sizeof (char), - buf + char_index * sizeof (char), - sizeof (char)); - char_index++; - } - while (buf[char_index - 1] != '\000'); + /* Loop, reading one byte at a time, until we reach the '\000' + end-of-string marker */ + do + { + target_read_memory (addr + char_index * sizeof (char), + buf + char_index * sizeof (char), sizeof (char)); + char_index++; + } + while (buf[char_index - 1] != '\000'); } /* Assuming *OLD_VECT points to an array of *SIZE objects of size @@ -221,48 +232,42 @@ extract_string (CORE_ADDR addr, char *buf) updating *OLD_VECT and *SIZE as necessary. */ void -grow_vect (old_vect, size, min_size, element_size) - void** old_vect; - size_t* size; - size_t min_size; - int element_size; -{ - if (*size < min_size) { - *size *= 2; - if (*size < min_size) - *size = min_size; - *old_vect = xrealloc (*old_vect, *size * element_size); - } +grow_vect (void **old_vect, size_t * size, size_t min_size, int element_size) +{ + if (*size < min_size) + { + *size *= 2; + if (*size < min_size) + *size = min_size; + *old_vect = xrealloc (*old_vect, *size * element_size); + } } /* True (non-zero) iff TARGET matches FIELD_NAME up to any trailing suffix of FIELD_NAME beginning "___" */ static int -field_name_match (field_name, target) - const char *field_name; - const char *target; +field_name_match (const char *field_name, const char *target) { int len = strlen (target); - return - STREQN (field_name, target, len) - && (field_name[len] == '\0' + return + STREQN (field_name, target, len) + && (field_name[len] == '\0' || (STREQN (field_name + len, "___", 3) - && ! STREQ (field_name + strlen (field_name) - 6, "___XVN"))); + && !STREQ (field_name + strlen (field_name) - 6, "___XVN"))); } /* The length of the prefix of NAME prior to any "___" suffix. */ int -ada_name_prefix_len (name) - const char* name; +ada_name_prefix_len (const char *name) { if (name == NULL) return 0; - else + else { - const char* p = strstr (name, "___"); + const char *p = strstr (name, "___"); if (p == NULL) return strlen (name); else @@ -272,7 +277,7 @@ ada_name_prefix_len (name) /* SUFFIX is a suffix of STR. False if STR is null. */ static int -is_suffix (const char* str, const char* suffix) +is_suffix (const char *str, const char *suffix) { int len1, len2; if (str == NULL) @@ -285,14 +290,12 @@ is_suffix (const char* str, const char* suffix) /* Create a value of type TYPE whose contents come from VALADDR, if it * is non-null, and whose memory address (in the inferior) is * ADDRESS. */ -struct value* -value_from_contents_and_address (type, valaddr, address) - struct type* type; - char* valaddr; - CORE_ADDR address; -{ - struct value* v = allocate_value (type); - if (valaddr == NULL) +struct value * +value_from_contents_and_address (struct type *type, char *valaddr, + CORE_ADDR address) +{ + struct value *v = allocate_value (type); + if (valaddr == NULL) VALUE_LAZY (v) = 1; else memcpy (VALUE_CONTENTS_RAW (v), valaddr, TYPE_LENGTH (type)); @@ -305,27 +308,25 @@ value_from_contents_and_address (type, valaddr, address) /* The contents of value VAL, beginning at offset OFFSET, treated as a value of type TYPE. The result is an lval in memory if VAL is. */ -static struct value* -coerce_unspec_val_to_type (val, offset, type) - struct value* val; - long offset; - struct type *type; +static struct value * +coerce_unspec_val_to_type (struct value *val, long offset, struct type *type) { CHECK_TYPEDEF (type); if (VALUE_LVAL (val) == lval_memory) return value_at_lazy (type, - VALUE_ADDRESS (val) + VALUE_OFFSET (val) + offset, NULL); - else + VALUE_ADDRESS (val) + VALUE_OFFSET (val) + offset, + NULL); + else { - struct value* result = allocate_value (type); + struct value *result = allocate_value (type); VALUE_LVAL (result) = not_lval; - if (VALUE_ADDRESS (val) == 0) + if (VALUE_ADDRESS (val) == 0) memcpy (VALUE_CONTENTS_RAW (result), VALUE_CONTENTS (val) + offset, - TYPE_LENGTH (type) > TYPE_LENGTH (VALUE_TYPE (val)) + TYPE_LENGTH (type) > TYPE_LENGTH (VALUE_TYPE (val)) ? TYPE_LENGTH (VALUE_TYPE (val)) : TYPE_LENGTH (type)); - else + else { - VALUE_ADDRESS (result) = + VALUE_ADDRESS (result) = VALUE_ADDRESS (val) + VALUE_OFFSET (val) + offset; VALUE_LAZY (result) = 1; } @@ -333,10 +334,8 @@ coerce_unspec_val_to_type (val, offset, type) } } -static char* -cond_offset_host (valaddr, offset) - char* valaddr; - long offset; +static char * +cond_offset_host (char *valaddr, long offset) { if (valaddr == NULL) return NULL; @@ -345,35 +344,33 @@ cond_offset_host (valaddr, offset) } static CORE_ADDR -cond_offset_target (address, offset) - CORE_ADDR address; - long offset; +cond_offset_target (CORE_ADDR address, long offset) { if (address == 0) return 0; - else + else return address + offset; } /* Perform execute_command on the result of concatenating all arguments up to NULL. */ static void -do_command (const char* arg, ...) +do_command (const char *arg, ...) { int len; - char* cmd; - const char* s; + char *cmd; + const char *s; va_list ap; va_start (ap, arg); len = 0; s = arg; cmd = ""; - for (; s != NULL; s = va_arg (ap, const char*)) + for (; s != NULL; s = va_arg (ap, const char *)) { - char* cmd1; + char *cmd1; len += strlen (s); - cmd1 = alloca (len+1); + cmd1 = alloca (len + 1); strcpy (cmd1, cmd); strcat (cmd1, s); cmd = cmd1; @@ -381,65 +378,62 @@ do_command (const char* arg, ...) va_end (ap); execute_command (cmd, 0); } - + /* Language Selection */ /* If the main program is in Ada, return language_ada, otherwise return LANG (the main program is in Ada iif the adainit symbol is found). MAIN_PST is not used. */ - + enum language -ada_update_initial_language (lang, main_pst) - enum language lang; - struct partial_symtab* main_pst; +ada_update_initial_language (enum language lang, + struct partial_symtab *main_pst) { - if (lookup_minimal_symbol ("adainit", (const char*) NULL, - (struct objfile*) NULL) != NULL) + if (lookup_minimal_symbol ("adainit", (const char *) NULL, + (struct objfile *) NULL) != NULL) /* return language_ada; */ /* FIXME: language_ada should be defined in defs.h */ return language_unknown; return lang; } - + /* Symbols */ /* Table of Ada operators and their GNAT-mangled names. Last entry is pair of NULLs. */ -const struct ada_opname_map ada_opname_table[] = -{ - { "Oadd", "\"+\"", BINOP_ADD }, - { "Osubtract", "\"-\"", BINOP_SUB }, - { "Omultiply", "\"*\"", BINOP_MUL }, - { "Odivide", "\"/\"", BINOP_DIV }, - { "Omod", "\"mod\"", BINOP_MOD }, - { "Orem", "\"rem\"", BINOP_REM }, - { "Oexpon", "\"**\"", BINOP_EXP }, - { "Olt", "\"<\"", BINOP_LESS }, - { "Ole", "\"<=\"", BINOP_LEQ }, - { "Ogt", "\">\"", BINOP_GTR }, - { "Oge", "\">=\"", BINOP_GEQ }, - { "Oeq", "\"=\"", BINOP_EQUAL }, - { "One", "\"/=\"", BINOP_NOTEQUAL }, - { "Oand", "\"and\"", BINOP_BITWISE_AND }, - { "Oor", "\"or\"", BINOP_BITWISE_IOR }, - { "Oxor", "\"xor\"", BINOP_BITWISE_XOR }, - { "Oconcat", "\"&\"", BINOP_CONCAT }, - { "Oabs", "\"abs\"", UNOP_ABS }, - { "Onot", "\"not\"", UNOP_LOGICAL_NOT }, - { "Oadd", "\"+\"", UNOP_PLUS }, - { "Osubtract", "\"-\"", UNOP_NEG }, - { NULL, NULL } +const struct ada_opname_map ada_opname_table[] = { + {"Oadd", "\"+\"", BINOP_ADD}, + {"Osubtract", "\"-\"", BINOP_SUB}, + {"Omultiply", "\"*\"", BINOP_MUL}, + {"Odivide", "\"/\"", BINOP_DIV}, + {"Omod", "\"mod\"", BINOP_MOD}, + {"Orem", "\"rem\"", BINOP_REM}, + {"Oexpon", "\"**\"", BINOP_EXP}, + {"Olt", "\"<\"", BINOP_LESS}, + {"Ole", "\"<=\"", BINOP_LEQ}, + {"Ogt", "\">\"", BINOP_GTR}, + {"Oge", "\">=\"", BINOP_GEQ}, + {"Oeq", "\"=\"", BINOP_EQUAL}, + {"One", "\"/=\"", BINOP_NOTEQUAL}, + {"Oand", "\"and\"", BINOP_BITWISE_AND}, + {"Oor", "\"or\"", BINOP_BITWISE_IOR}, + {"Oxor", "\"xor\"", BINOP_BITWISE_XOR}, + {"Oconcat", "\"&\"", BINOP_CONCAT}, + {"Oabs", "\"abs\"", UNOP_ABS}, + {"Onot", "\"not\"", UNOP_LOGICAL_NOT}, + {"Oadd", "\"+\"", UNOP_PLUS}, + {"Osubtract", "\"-\"", UNOP_NEG}, + {NULL, NULL} }; /* True if STR should be suppressed in info listings. */ static int -is_suppressed_name (str) - const char* str; +is_suppressed_name (const char *str) { if (STREQN (str, "_ada_", 5)) str += 5; @@ -447,13 +441,13 @@ is_suppressed_name (str) return 1; else { - const char* p; - const char* suffix = strstr (str, "___"); + const char *p; + const char *suffix = strstr (str, "___"); if (suffix != NULL && suffix[3] != 'X') return 1; if (suffix == NULL) suffix = str + strlen (str); - for (p = suffix-1; p != str; p -= 1) + for (p = suffix - 1; p != str; p -= 1) if (isupper (*p)) { int i; @@ -462,11 +456,11 @@ is_suppressed_name (str) if (*p != 'O') return 1; for (i = 0; ada_opname_table[i].mangled != NULL; i += 1) - if (STREQN (ada_opname_table[i].mangled, p, + if (STREQN (ada_opname_table[i].mangled, p, strlen (ada_opname_table[i].mangled))) goto OK; return 1; - OK: ; + OK:; } return 0; } @@ -475,43 +469,43 @@ is_suppressed_name (str) /* The "mangled" form of DEMANGLED, according to GNAT conventions. * The result is valid until the next call to ada_mangle. */ char * -ada_mangle (demangled) - const char* demangled; +ada_mangle (const char *demangled) { - static char* mangling_buffer = NULL; + static char *mangling_buffer = NULL; static size_t mangling_buffer_size = 0; - const char* p; + const char *p; int k; - + if (demangled == NULL) return NULL; - GROW_VECT (mangling_buffer, mangling_buffer_size, 2*strlen (demangled) + 10); + GROW_VECT (mangling_buffer, mangling_buffer_size, + 2 * strlen (demangled) + 10); k = 0; for (p = demangled; *p != '\0'; p += 1) { - if (*p == '.') + if (*p == '.') { - mangling_buffer[k] = mangling_buffer[k+1] = '_'; + mangling_buffer[k] = mangling_buffer[k + 1] = '_'; k += 2; } else if (*p == '"') { - const struct ada_opname_map* mapping; + const struct ada_opname_map *mapping; for (mapping = ada_opname_table; - mapping->mangled != NULL && - ! STREQN (mapping->demangled, p, strlen (mapping->demangled)); + mapping->mangled != NULL && + !STREQN (mapping->demangled, p, strlen (mapping->demangled)); p += 1) ; if (mapping->mangled == NULL) error ("invalid Ada operator name: %s", p); - strcpy (mangling_buffer+k, mapping->mangled); + strcpy (mangling_buffer + k, mapping->mangled); k += strlen (mapping->mangled); break; } - else + else { mangling_buffer[k] = *p; k += 1; @@ -525,19 +519,19 @@ ada_mangle (demangled) /* Return NAME folded to lower case, or, if surrounded by single * quotes, unfolded, but with the quotes stripped away. Result good * to next call. */ -char* -ada_fold_name (const char* name) +char * +ada_fold_name (const char *name) { - static char* fold_buffer = NULL; + static char *fold_buffer = NULL; static size_t fold_buffer_size = 0; int len = strlen (name); - GROW_VECT (fold_buffer, fold_buffer_size, len+1); + GROW_VECT (fold_buffer, fold_buffer_size, len + 1); if (name[0] == '\'') { - strncpy (fold_buffer, name+1, len-2); - fold_buffer[len-2] = '\000'; + strncpy (fold_buffer, name + 1, len - 2); + fold_buffer[len - 2] = '\000'; } else { @@ -563,17 +557,16 @@ ada_fold_name (const char* name) */ char * -ada_demangle (mangled) - const char* mangled; +ada_demangle (const char *mangled) { int i, j; int len0; - const char* p; - char* demangled; + const char *p; + char *demangled; int at_start_name; - static char* demangling_buffer = NULL; + static char *demangling_buffer = NULL; static size_t demangling_buffer_size = 0; - + if (STREQN (mangled, "_ada_", 5)) mangled += 5; @@ -583,7 +576,7 @@ ada_demangle (mangled) p = strstr (mangled, "___"); if (p == NULL) len0 = strlen (mangled); - else + else { if (p[3] == 'X') len0 = p - mangled; @@ -596,19 +589,20 @@ ada_demangle (mangled) len0 -= 1; /* Make demangled big enough for possible expansion by operator name. */ - GROW_VECT (demangling_buffer, demangling_buffer_size, 2*len0+1); + GROW_VECT (demangling_buffer, demangling_buffer_size, 2 * len0 + 1); demangled = demangling_buffer; - if (isdigit (mangled[len0 - 1])) { - for (i = len0-2; i >= 0 && isdigit (mangled[i]); i -= 1) - ; - if (i > 1 && mangled[i] == '_' && mangled[i-1] == '_') - len0 = i - 1; - else if (mangled[i] == '$') - len0 = i; - } + if (isdigit (mangled[len0 - 1])) + { + for (i = len0 - 2; i >= 0 && isdigit (mangled[i]); i -= 1) + ; + if (i > 1 && mangled[i] == '_' && mangled[i - 1] == '_') + len0 = i - 1; + else if (mangled[i] == '$') + len0 = i; + } - for (i = 0, j = 0; i < len0 && ! isalpha (mangled[i]); i += 1, j += 1) + for (i = 0, j = 0; i < len0 && !isalpha (mangled[i]); i += 1, j += 1) demangled[j] = mangled[i]; at_start_name = 1; @@ -619,9 +613,10 @@ ada_demangle (mangled) int k; for (k = 0; ada_opname_table[k].mangled != NULL; k += 1) { - int op_len = strlen (ada_opname_table[k].mangled); - if (STREQN (ada_opname_table[k].mangled+1, mangled+i+1, op_len-1) - && ! isalnum (mangled[i + op_len])) + int op_len = strlen (ada_opname_table[k].mangled); + if (STREQN + (ada_opname_table[k].mangled + 1, mangled + i + 1, + op_len - 1) && !isalnum (mangled[i + op_len])) { strcpy (demangled + j, ada_opname_table[k].demangled); at_start_name = 0; @@ -635,9 +630,9 @@ ada_demangle (mangled) } at_start_name = 0; - if (i < len0-4 && STREQN (mangled+i, "TK__", 4)) + if (i < len0 - 4 && STREQN (mangled + i, "TK__", 4)) i += 2; - if (mangled[i] == 'X' && i != 0 && isalnum (mangled[i-1])) + if (mangled[i] == 'X' && i != 0 && isalnum (mangled[i - 1])) { do i += 1; @@ -645,16 +640,18 @@ ada_demangle (mangled) if (i < len0) goto Suppress; } - else if (i < len0-2 && mangled[i] == '_' && mangled[i+1] == '_') + else if (i < len0 - 2 && mangled[i] == '_' && mangled[i + 1] == '_') { demangled[j] = '.'; at_start_name = 1; - i += 2; j += 1; + i += 2; + j += 1; } else { demangled[j] = mangled[i]; - i += 1; j += 1; + i += 1; + j += 1; } } demangled[j] = '\000'; @@ -666,8 +663,7 @@ ada_demangle (mangled) return demangled; Suppress: - GROW_VECT (demangling_buffer, demangling_buffer_size, - strlen (mangled) + 3); + GROW_VECT (demangling_buffer, demangling_buffer_size, strlen (mangled) + 3); demangled = demangling_buffer; if (mangled[0] == '<') strcpy (demangled, mangled); @@ -685,46 +681,43 @@ Suppress: * either argument is NULL. */ int -ada_match_name (sym_name, name, wild) - const char* sym_name; - const char* name; - int wild; +ada_match_name (const char *sym_name, const char *name, int wild) { if (sym_name == NULL || name == NULL) return 0; else if (wild) return wild_match (name, strlen (name), sym_name); - else { - int len_name = strlen (name); - return (STREQN (sym_name, name, len_name) - && is_name_suffix (sym_name+len_name)) - || (STREQN (sym_name, "_ada_", 5) - && STREQN (sym_name+5, name, len_name) - && is_name_suffix (sym_name+len_name+5)); - } + else + { + int len_name = strlen (name); + return (STREQN (sym_name, name, len_name) + && is_name_suffix (sym_name + len_name)) + || (STREQN (sym_name, "_ada_", 5) + && STREQN (sym_name + 5, name, len_name) + && is_name_suffix (sym_name + len_name + 5)); + } } /* True (non-zero) iff in Ada mode, the symbol SYM should be suppressed in info listings. */ int -ada_suppress_symbol_printing (sym) - struct symbol *sym; +ada_suppress_symbol_printing (struct symbol *sym) { if (SYMBOL_NAMESPACE (sym) == STRUCT_NAMESPACE) return 1; - else + else return is_suppressed_name (SYMBOL_NAME (sym)); } - + /* Arrays */ /* Names of MAX_ADA_DIMENS bounds in P_BOUNDS fields of array descriptors. */ -static char* bound_name[] = { - "LB0", "UB0", "LB1", "UB1", "LB2", "UB2", "LB3", "UB3", +static char *bound_name[] = { + "LB0", "UB0", "LB1", "UB1", "LB2", "UB2", "LB3", "UB3", "LB4", "UB4", "LB5", "UB5", "LB6", "UB6", "LB7", "UB7" }; @@ -735,14 +728,10 @@ static char* bound_name[] = { /* Like modify_field, but allows bitpos > wordlength. */ static void -modify_general_field (addr, fieldval, bitpos, bitsize) - char *addr; - LONGEST fieldval; - int bitpos, bitsize; +modify_general_field (char *addr, LONGEST fieldval, int bitpos, int bitsize) { - modify_field (addr + sizeof (LONGEST) * bitpos / (8 * sizeof (LONGEST)), - fieldval, bitpos % (8 * sizeof (LONGEST)), - bitsize); + modify_field (addr + sizeof (LONGEST) * bitpos / (8 * sizeof (LONGEST)), + fieldval, bitpos % (8 * sizeof (LONGEST)), bitsize); } @@ -751,9 +740,8 @@ modify_general_field (addr, fieldval, bitpos, bitsize) /* The descriptor or array type, if any, indicated by TYPE; removes level of indirection, if needed. */ -static struct type* -desc_base_type (type) - struct type* type; +static struct type * +desc_base_type (struct type *type) { if (type == NULL) return NULL; @@ -766,26 +754,25 @@ desc_base_type (type) /* True iff TYPE indicates a "thin" array pointer type. */ static int -is_thin_pntr (struct type* type) +is_thin_pntr (struct type *type) { - return + return is_suffix (ada_type_name (desc_base_type (type)), "___XUT") || is_suffix (ada_type_name (desc_base_type (type)), "___XUT___XVE"); } /* The descriptor type for thin pointer type TYPE. */ -static struct type* -thin_descriptor_type (struct type* type) +static struct type * +thin_descriptor_type (struct type *type) { - struct type* base_type = desc_base_type (type); + struct type *base_type = desc_base_type (type); if (base_type == NULL) return NULL; if (is_suffix (ada_type_name (base_type), "___XVE")) return base_type; - else + else { - struct type* alt_type = - ada_find_parallel_type (base_type, "___XVE"); + struct type *alt_type = ada_find_parallel_type (base_type, "___XVE"); if (alt_type == NULL) return base_type; else @@ -794,21 +781,21 @@ thin_descriptor_type (struct type* type) } /* A pointer to the array data for thin-pointer value VAL. */ -static struct value* -thin_data_pntr (struct value* val) +static struct value * +thin_data_pntr (struct value *val) { - struct type* type = VALUE_TYPE (val); + struct type *type = VALUE_TYPE (val); if (TYPE_CODE (type) == TYPE_CODE_PTR) - return value_cast (desc_data_type (thin_descriptor_type (type)), + return value_cast (desc_data_type (thin_descriptor_type (type)), value_copy (val)); - else + else return value_from_longest (desc_data_type (thin_descriptor_type (type)), VALUE_ADDRESS (val) + VALUE_OFFSET (val)); } /* True iff TYPE indicates a "thick" array pointer type. */ static int -is_thick_pntr (struct type* type) +is_thick_pntr (struct type *type) { type = desc_base_type (type); return (type != NULL && TYPE_CODE (type) == TYPE_CODE_STRUCT @@ -817,11 +804,10 @@ is_thick_pntr (struct type* type) /* If TYPE is the type of an array descriptor (fat or thin pointer) or a pointer to one, the type of its bounds data; otherwise, NULL. */ -static struct type* -desc_bounds_type (type) - struct type* type; +static struct type * +desc_bounds_type (struct type *type) { - struct type* r; + struct type *r; type = desc_base_type (type); @@ -847,34 +833,34 @@ desc_bounds_type (type) /* If ARR is an array descriptor (fat or thin pointer), or pointer to one, a pointer to its bounds data. Otherwise NULL. */ -static struct value* -desc_bounds (arr) - struct value* arr; +static struct value * +desc_bounds (struct value *arr) { - struct type* type = check_typedef (VALUE_TYPE (arr)); - if (is_thin_pntr (type)) + struct type *type = check_typedef (VALUE_TYPE (arr)); + if (is_thin_pntr (type)) { - struct type* bounds_type = desc_bounds_type (thin_descriptor_type (type)); + struct type *bounds_type = + desc_bounds_type (thin_descriptor_type (type)); LONGEST addr; if (desc_bounds_type == NULL) error ("Bad GNAT array descriptor"); /* NOTE: The following calculation is not really kosher, but - since desc_type is an XVE-encoded type (and shouldn't be), - the correct calculation is a real pain. FIXME (and fix GCC). */ + since desc_type is an XVE-encoded type (and shouldn't be), + the correct calculation is a real pain. FIXME (and fix GCC). */ if (TYPE_CODE (type) == TYPE_CODE_PTR) addr = value_as_long (arr); - else + else addr = VALUE_ADDRESS (arr) + VALUE_OFFSET (arr); - return - value_from_longest (lookup_pointer_type (bounds_type), - addr - TYPE_LENGTH (bounds_type)); + return + value_from_longest (lookup_pointer_type (bounds_type), + addr - TYPE_LENGTH (bounds_type)); } else if (is_thick_pntr (type)) - return value_struct_elt (&arr, NULL, "P_BOUNDS", NULL, + return value_struct_elt (&arr, NULL, "P_BOUNDS", NULL, "Bad GNAT array descriptor"); else return NULL; @@ -883,8 +869,7 @@ desc_bounds (arr) /* If TYPE is the type of an array-descriptor (fat pointer), the bit position of the field containing the address of the bounds data. */ static int -fat_pntr_bounds_bitpos (type) - struct type* type; +fat_pntr_bounds_bitpos (struct type *type) { return TYPE_FIELD_BITPOS (desc_base_type (type), 1); } @@ -892,12 +877,11 @@ fat_pntr_bounds_bitpos (type) /* If TYPE is the type of an array-descriptor (fat pointer), the bit size of the field containing the address of the bounds data. */ static int -fat_pntr_bounds_bitsize (type) - struct type* type; +fat_pntr_bounds_bitsize (struct type *type) { type = desc_base_type (type); - if (TYPE_FIELD_BITSIZE (type, 1) > 0) + if (TYPE_FIELD_BITSIZE (type, 1) > 0) return TYPE_FIELD_BITSIZE (type, 1); else return 8 * TYPE_LENGTH (check_typedef (TYPE_FIELD_TYPE (type, 1))); @@ -907,16 +891,15 @@ fat_pntr_bounds_bitsize (type) pointer to one, the type of its array data (a pointer-to-array-with-no-bounds type); otherwise, NULL. Use ada_type_of_array to get an array type with bounds data. */ -static struct type* -desc_data_type (type) - struct type* type; +static struct type * +desc_data_type (struct type *type) { type = desc_base_type (type); /* NOTE: The following is bogus; see comment in desc_bounds. */ if (is_thin_pntr (type)) - return lookup_pointer_type - (desc_base_type (TYPE_FIELD_TYPE (thin_descriptor_type (type),1))); + return lookup_pointer_type + (desc_base_type (TYPE_FIELD_TYPE (thin_descriptor_type (type), 1))); else if (is_thick_pntr (type)) return lookup_struct_elt_type (type, "P_ARRAY", 1); else @@ -925,15 +908,14 @@ desc_data_type (type) /* If ARR is an array descriptor (fat or thin pointer), a pointer to its array data. */ -static struct value* -desc_data (arr) - struct value* arr; +static struct value * +desc_data (struct value *arr) { - struct type* type = VALUE_TYPE (arr); + struct type *type = VALUE_TYPE (arr); if (is_thin_pntr (type)) return thin_data_pntr (arr); else if (is_thick_pntr (type)) - return value_struct_elt (&arr, NULL, "P_ARRAY", NULL, + return value_struct_elt (&arr, NULL, "P_ARRAY", NULL, "Bad GNAT array descriptor"); else return NULL; @@ -943,8 +925,7 @@ desc_data (arr) /* If TYPE is the type of an array-descriptor (fat pointer), the bit position of the field containing the address of the data. */ static int -fat_pntr_data_bitpos (type) - struct type* type; +fat_pntr_data_bitpos (struct type *type) { return TYPE_FIELD_BITPOS (desc_base_type (type), 0); } @@ -952,27 +933,23 @@ fat_pntr_data_bitpos (type) /* If TYPE is the type of an array-descriptor (fat pointer), the bit size of the field containing the address of the data. */ static int -fat_pntr_data_bitsize (type) - struct type* type; +fat_pntr_data_bitsize (struct type *type) { type = desc_base_type (type); if (TYPE_FIELD_BITSIZE (type, 0) > 0) return TYPE_FIELD_BITSIZE (type, 0); - else + else return TARGET_CHAR_BIT * TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0)); } /* If BOUNDS is an array-bounds structure (or pointer to one), return the Ith lower bound stored in it, if WHICH is 0, and the Ith upper bound, if WHICH is 1. The first bound is I=1. */ -static struct value* -desc_one_bound (bounds, i, which) - struct value* bounds; - int i; - int which; +static struct value * +desc_one_bound (struct value *bounds, int i, int which) { - return value_struct_elt (&bounds, NULL, bound_name[2*i+which-2], NULL, + return value_struct_elt (&bounds, NULL, bound_name[2 * i + which - 2], NULL, "Bad GNAT array descriptor bounds"); } @@ -980,51 +957,42 @@ desc_one_bound (bounds, i, which) of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper bound, if WHICH is 1. The first bound is I=1. */ static int -desc_bound_bitpos (type, i, which) - struct type* type; - int i; - int which; +desc_bound_bitpos (struct type *type, int i, int which) { - return TYPE_FIELD_BITPOS (desc_base_type (type), 2*i+which-2); + return TYPE_FIELD_BITPOS (desc_base_type (type), 2 * i + which - 2); } /* If BOUNDS is an array-bounds structure type, return the bit field size of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper bound, if WHICH is 1. The first bound is I=1. */ static int -desc_bound_bitsize (type, i, which) - struct type* type; - int i; - int which; +desc_bound_bitsize (struct type *type, int i, int which) { type = desc_base_type (type); - if (TYPE_FIELD_BITSIZE (type, 2*i+which-2) > 0) - return TYPE_FIELD_BITSIZE (type, 2*i+which-2); - else - return 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (type, 2*i+which-2)); + if (TYPE_FIELD_BITSIZE (type, 2 * i + which - 2) > 0) + return TYPE_FIELD_BITSIZE (type, 2 * i + which - 2); + else + return 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (type, 2 * i + which - 2)); } /* If TYPE is the type of an array-bounds structure, the type of its - Ith bound (numbering from 1). Otherwise, NULL. */ -static struct type* -desc_index_type (type, i) - struct type* type; - int i; + Ith bound (numbering from 1). Otherwise, NULL. */ +static struct type * +desc_index_type (struct type *type, int i) { type = desc_base_type (type); if (TYPE_CODE (type) == TYPE_CODE_STRUCT) - return lookup_struct_elt_type (type, bound_name[2*i-2], 1); - else + return lookup_struct_elt_type (type, bound_name[2 * i - 2], 1); + else return NULL; } /* The number of index positions in the array-bounds type TYPE. 0 if TYPE is NULL. */ static int -desc_arity (type) - struct type* type; +desc_arity (struct type *type) { type = desc_base_type (type); @@ -1036,8 +1004,7 @@ desc_arity (type) /* Non-zero iff type is a simple array type (or pointer to one). */ int -ada_is_simple_array (type) - struct type* type; +ada_is_simple_array (struct type *type) { if (type == NULL) return 0; @@ -1049,20 +1016,19 @@ ada_is_simple_array (type) /* Non-zero iff type belongs to a GNAT array descriptor. */ int -ada_is_array_descriptor (type) - struct type* type; +ada_is_array_descriptor (struct type *type) { - struct type* data_type = desc_data_type (type); + struct type *data_type = desc_data_type (type); if (type == NULL) return 0; CHECK_TYPEDEF (type); - return + return data_type != NULL && ((TYPE_CODE (data_type) == TYPE_CODE_PTR && TYPE_TARGET_TYPE (data_type) != NULL && TYPE_CODE (TYPE_TARGET_TYPE (data_type)) == TYPE_CODE_ARRAY) - || + || TYPE_CODE (data_type) == TYPE_CODE_ARRAY) && desc_arity (desc_bounds_type (type)) > 0; } @@ -1072,15 +1038,14 @@ ada_is_array_descriptor (type) debugging output from GNAT. Re-examine periodically to see if it is still needed. */ int -ada_is_bogus_array_descriptor (type) - struct type *type; +ada_is_bogus_array_descriptor (struct type *type) { - return + return type != NULL && TYPE_CODE (type) == TYPE_CODE_STRUCT && (lookup_struct_elt_type (type, "P_BOUNDS", 1) != NULL || lookup_struct_elt_type (type, "P_ARRAY", 1) != NULL) - && ! ada_is_array_descriptor (type); + && !ada_is_array_descriptor (type); } @@ -1091,47 +1056,47 @@ ada_is_bogus_array_descriptor (type) the ARR denotes a null array descriptor and BOUNDS is non-zero, returns NULL. The result is simply the type of ARR if ARR is not a descriptor. */ -struct type* -ada_type_of_array (arr, bounds) - struct value* arr; - int bounds; +struct type * +ada_type_of_array (struct value *arr, int bounds) { if (ada_is_packed_array_type (VALUE_TYPE (arr))) return decode_packed_array_type (VALUE_TYPE (arr)); - if (! ada_is_array_descriptor (VALUE_TYPE (arr))) + if (!ada_is_array_descriptor (VALUE_TYPE (arr))) return VALUE_TYPE (arr); - - if (! bounds) - return check_typedef (TYPE_TARGET_TYPE (desc_data_type (VALUE_TYPE (arr)))); + + if (!bounds) + return + check_typedef (TYPE_TARGET_TYPE (desc_data_type (VALUE_TYPE (arr)))); else { - struct type* elt_type; + struct type *elt_type; int arity; - struct value* descriptor; + struct value *descriptor; struct objfile *objf = TYPE_OBJFILE (VALUE_TYPE (arr)); elt_type = ada_array_element_type (VALUE_TYPE (arr), -1); arity = ada_array_arity (VALUE_TYPE (arr)); - if (elt_type == NULL || arity == 0) + if (elt_type == NULL || arity == 0) return check_typedef (VALUE_TYPE (arr)); descriptor = desc_bounds (arr); - if (value_as_long (descriptor) == 0) + if (value_as_long (descriptor) == 0) return NULL; - while (arity > 0) { - struct type* range_type = alloc_type (objf); - struct type* array_type = alloc_type (objf); - struct value* low = desc_one_bound (descriptor, arity, 0); - struct value* high = desc_one_bound (descriptor, arity, 1); - arity -= 1; - - create_range_type (range_type, VALUE_TYPE (low), - (int) value_as_long (low), - (int) value_as_long (high)); - elt_type = create_array_type (array_type, elt_type, range_type); - } + while (arity > 0) + { + struct type *range_type = alloc_type (objf); + struct type *array_type = alloc_type (objf); + struct value *low = desc_one_bound (descriptor, arity, 0); + struct value *high = desc_one_bound (descriptor, arity, 1); + arity -= 1; + + create_range_type (range_type, VALUE_TYPE (low), + (int) value_as_long (low), + (int) value_as_long (high)); + elt_type = create_array_type (array_type, elt_type, range_type); + } return lookup_pointer_type (elt_type); } @@ -1141,13 +1106,12 @@ ada_type_of_array (arr, bounds) Otherwise, returns either a standard GDB array with bounds set appropriately or, if ARR is a non-null fat pointer, a pointer to a standard GDB array. Returns NULL if ARR is a null fat pointer. */ -struct value* -ada_coerce_to_simple_array_ptr (arr) - struct value* arr; +struct value * +ada_coerce_to_simple_array_ptr (struct value *arr) { if (ada_is_array_descriptor (VALUE_TYPE (arr))) { - struct type* arrType = ada_type_of_array (arr, 1); + struct type *arrType = ada_type_of_array (arr, 1); if (arrType == NULL) return NULL; return value_cast (arrType, value_copy (desc_data (arr))); @@ -1161,33 +1125,31 @@ ada_coerce_to_simple_array_ptr (arr) /* If ARR does not represent an array, returns ARR unchanged. Otherwise, returns a standard GDB array describing ARR (which may be ARR itself if it already is in the proper form). */ -struct value* -ada_coerce_to_simple_array (arr) - struct value* arr; +struct value * +ada_coerce_to_simple_array (struct value *arr) { if (ada_is_array_descriptor (VALUE_TYPE (arr))) { - struct value* arrVal = ada_coerce_to_simple_array_ptr (arr); + struct value *arrVal = ada_coerce_to_simple_array_ptr (arr); if (arrVal == NULL) error ("Bounds unavailable for null array pointer."); return value_ind (arrVal); } else if (ada_is_packed_array_type (VALUE_TYPE (arr))) return decode_packed_array (arr); - else + else return arr; } /* If TYPE represents a GNAT array type, return it translated to an ordinary GDB array type (possibly with BITSIZE fields indicating packing). For other types, is the identity. */ -struct type* -ada_coerce_to_simple_array_type (type) - struct type* type; +struct type * +ada_coerce_to_simple_array_type (struct type *type) { - struct value* mark = value_mark (); - struct value* dummy = value_from_longest (builtin_type_long, 0); - struct type* result; + struct value *mark = value_mark (); + struct value *dummy = value_from_longest (builtin_type_long, 0); + struct type *result; VALUE_TYPE (dummy) = type; result = ada_type_of_array (dummy, 0); value_free_to_mark (dummy); @@ -1196,13 +1158,12 @@ ada_coerce_to_simple_array_type (type) /* Non-zero iff TYPE represents a standard GNAT packed-array type. */ int -ada_is_packed_array_type (type) - struct type* type; +ada_is_packed_array_type (struct type *type) { if (type == NULL) return 0; CHECK_TYPEDEF (type); - return + return ada_type_name (type) != NULL && strstr (ada_type_name (type), "___XP") != NULL; } @@ -1215,13 +1176,11 @@ ada_is_packed_array_type (type) constituent arrays) recorded in the BITSIZE components of its TYPE_FIELD_BITSIZE values, and with *ELT_BITS set to its total size in bits. */ -static struct type* -packed_array_type (type, elt_bits) - struct type* type; - long* elt_bits; +static struct type * +packed_array_type (struct type *type, long *elt_bits) { - struct type* new_elt_type; - struct type* new_type; + struct type *new_elt_type; + struct type *new_type; LONGEST low_bound, high_bound; CHECK_TYPEDEF (type); @@ -1235,15 +1194,15 @@ packed_array_type (type, elt_bits) TYPE_FIELD_BITSIZE (new_type, 0) = *elt_bits; TYPE_NAME (new_type) = ada_type_name (type); - if (get_discrete_bounds (TYPE_FIELD_TYPE (type, 0), + if (get_discrete_bounds (TYPE_FIELD_TYPE (type, 0), &low_bound, &high_bound) < 0) low_bound = high_bound = 0; if (high_bound < low_bound) *elt_bits = TYPE_LENGTH (new_type) = 0; - else + else { *elt_bits *= (high_bound - low_bound + 1); - TYPE_LENGTH (new_type) = + TYPE_LENGTH (new_type) = (*elt_bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; } @@ -1254,16 +1213,15 @@ packed_array_type (type, elt_bits) /* The array type encoded by TYPE, where ada_is_packed_array_type (TYPE). */ -static struct type* -decode_packed_array_type (type) - struct type* type; -{ - struct symbol** syms; - struct block** blocks; - const char* raw_name = ada_type_name (check_typedef (type)); - char* name = (char*) alloca (strlen (raw_name) + 1); - char* tail = strstr (raw_name, "___XP"); - struct type* shadow_type; +static struct type * +decode_packed_array_type (struct type *type) +{ + struct symbol **syms; + struct block **blocks; + const char *raw_name = ada_type_name (check_typedef (type)); + char *name = (char *) alloca (strlen (raw_name) + 1); + char *tail = strstr (raw_name, "___XP"); + struct type *shadow_type; long bits; int i, n; @@ -1272,7 +1230,7 @@ decode_packed_array_type (type) /* NOTE: Use ada_lookup_symbol_list because of bug in some versions * of gcc (Solaris, e.g.). FIXME when compiler is fixed. */ - n = ada_lookup_symbol_list (name, get_selected_block (NULL), + n = ada_lookup_symbol_list (name, get_selected_block (NULL), VAR_NAMESPACE, &syms, &blocks); for (i = 0; i < n; i += 1) if (syms[i] != NULL && SYMBOL_CLASS (syms[i]) == LOC_TYPEDEF @@ -1290,13 +1248,13 @@ decode_packed_array_type (type) warning ("could not understand bounds information on packed array"); return NULL; } - + if (sscanf (tail + sizeof ("___XP") - 1, "%ld", &bits) != 1) { warning ("could not understand bit size information on packed array"); return NULL; } - + return packed_array_type (shadow_type, &bits); } @@ -1306,11 +1264,10 @@ decode_packed_array_type (type) target types are set to the number of bits in each element, and the type length is set appropriately. */ -static struct value* -decode_packed_array (arr) - struct value* arr; +static struct value * +decode_packed_array (struct value *arr) { - struct type* type = decode_packed_array_type (VALUE_TYPE (arr)); + struct type *type = decode_packed_array_type (VALUE_TYPE (arr)); if (type == NULL) { @@ -1325,39 +1282,36 @@ decode_packed_array (arr) /* The value of the element of packed array ARR at the ARITY indices given in IND. ARR must be a simple array. */ -static struct value* -value_subscript_packed (arr, arity, ind) - struct value* arr; - int arity; - struct value** ind; +static struct value * +value_subscript_packed (struct value *arr, int arity, struct value **ind) { int i; int bits, elt_off, bit_off; long elt_total_bit_offset; - struct type* elt_type; - struct value* v; + struct type *elt_type; + struct value *v; bits = 0; elt_total_bit_offset = 0; elt_type = check_typedef (VALUE_TYPE (arr)); - for (i = 0; i < arity; i += 1) + for (i = 0; i < arity; i += 1) { - if (TYPE_CODE (elt_type) != TYPE_CODE_ARRAY + if (TYPE_CODE (elt_type) != TYPE_CODE_ARRAY || TYPE_FIELD_BITSIZE (elt_type, 0) == 0) - error ("attempt to do packed indexing of something other than a packed array"); + error + ("attempt to do packed indexing of something other than a packed array"); else { struct type *range_type = TYPE_INDEX_TYPE (elt_type); LONGEST lowerbound, upperbound; LONGEST idx; - if (get_discrete_bounds (range_type, &lowerbound, - &upperbound) < 0) + if (get_discrete_bounds (range_type, &lowerbound, &upperbound) < 0) { warning ("don't know bounds of array"); lowerbound = upperbound = 0; } - + idx = value_as_long (value_pos_atr (ind[i])); if (idx < lowerbound || idx > upperbound) warning ("packed array index %ld out of bounds", (long) idx); @@ -1368,8 +1322,8 @@ value_subscript_packed (arr, arity, ind) } elt_off = elt_total_bit_offset / HOST_CHAR_BIT; bit_off = elt_total_bit_offset % HOST_CHAR_BIT; - - v = ada_value_primitive_packed_val (arr, NULL, elt_off, bit_off, + + v = ada_value_primitive_packed_val (arr, NULL, elt_off, bit_off, bits, elt_type); if (VALUE_LVAL (arr) == lval_internalvar) VALUE_LVAL (v) = lval_internalvar_component; @@ -1381,19 +1335,19 @@ value_subscript_packed (arr, arity, ind) /* Non-zero iff TYPE includes negative integer values. */ static int -has_negatives (type) - struct type* type; +has_negatives (struct type *type) { - switch (TYPE_CODE (type)) { - default: - return 0; - case TYPE_CODE_INT: - return ! TYPE_UNSIGNED (type); - case TYPE_CODE_RANGE: - return TYPE_LOW_BOUND (type) < 0; - } + switch (TYPE_CODE (type)) + { + default: + return 0; + case TYPE_CODE_INT: + return !TYPE_UNSIGNED (type); + case TYPE_CODE_RANGE: + return TYPE_LOW_BOUND (type) < 0; + } } - + /* Create a new value of type TYPE from the contents of OBJ starting at byte OFFSET, and bit offset BIT_OFFSET within that byte, @@ -1404,32 +1358,26 @@ has_negatives (type) in this case is never an lval. Assumes 0 <= BIT_OFFSET < HOST_CHAR_BIT. */ -struct value* -ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, - bit_size, type) - struct value* obj; - char* valaddr; - long offset; - int bit_offset; - int bit_size; - struct type* type; -{ - struct value* v; +struct value * +ada_value_primitive_packed_val (struct value *obj, char *valaddr, long offset, + int bit_offset, int bit_size, + struct type *type) +{ + struct value *v; int src, /* Index into the source area. */ targ, /* Index into the target area. */ - i, - srcBitsLeft, /* Number of source bits left to move. */ + i, srcBitsLeft, /* Number of source bits left to move. */ nsrc, ntarg, /* Number of source and target bytes. */ unusedLS, /* Number of bits in next significant * byte of source that are unused. */ accumSize; /* Number of meaningful bits in accum */ - unsigned char* bytes; /* First byte containing data to unpack. */ - unsigned char* unpacked; + unsigned char *bytes; /* First byte containing data to unpack. */ + unsigned char *unpacked; unsigned long accum; /* Staging area for bits being transferred */ unsigned char sign; int len = (bit_size + bit_offset + HOST_CHAR_BIT - 1) / 8; /* Transmit bytes from least to most significant; delta is the - * direction the indices move. */ + * direction the indices move. */ int delta = BITS_BIG_ENDIAN ? -1 : 1; CHECK_TYPEDEF (type); @@ -1437,22 +1385,22 @@ ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, if (obj == NULL) { v = allocate_value (type); - bytes = (unsigned char*) (valaddr + offset); + bytes = (unsigned char *) (valaddr + offset); } else if (VALUE_LAZY (obj)) { v = value_at (type, VALUE_ADDRESS (obj) + VALUE_OFFSET (obj) + offset, NULL); - bytes = (unsigned char*) alloca (len); + bytes = (unsigned char *) alloca (len); read_memory (VALUE_ADDRESS (v), bytes, len); } - else + else { v = allocate_value (type); - bytes = (unsigned char*) VALUE_CONTENTS (obj) + offset; + bytes = (unsigned char *) VALUE_CONTENTS (obj) + offset; } - - if (obj != NULL) + + if (obj != NULL) { VALUE_LVAL (v) = VALUE_LVAL (obj); if (VALUE_LVAL (obj) == lval_internalvar) @@ -1461,14 +1409,14 @@ ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, VALUE_BITPOS (v) = bit_offset + VALUE_BITPOS (obj); VALUE_BITSIZE (v) = bit_size; if (VALUE_BITPOS (v) >= HOST_CHAR_BIT) - { - VALUE_ADDRESS (v) += 1; - VALUE_BITPOS (v) -= HOST_CHAR_BIT; - } + { + VALUE_ADDRESS (v) += 1; + VALUE_BITPOS (v) -= HOST_CHAR_BIT; + } } else VALUE_BITSIZE (v) = bit_size; - unpacked = (unsigned char*) VALUE_CONTENTS (v); + unpacked = (unsigned char *) VALUE_CONTENTS (v); srcBitsLeft = bit_size; nsrc = len; @@ -1481,34 +1429,34 @@ ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, } else if (BITS_BIG_ENDIAN) { - src = len-1; - if (has_negatives (type) && - ((bytes[0] << bit_offset) & (1 << (HOST_CHAR_BIT-1)))) + src = len - 1; + if (has_negatives (type) && + ((bytes[0] << bit_offset) & (1 << (HOST_CHAR_BIT - 1)))) sign = ~0; - - unusedLS = + + unusedLS = (HOST_CHAR_BIT - (bit_size + bit_offset) % HOST_CHAR_BIT) % HOST_CHAR_BIT; switch (TYPE_CODE (type)) - { - case TYPE_CODE_ARRAY: - case TYPE_CODE_UNION: - case TYPE_CODE_STRUCT: - /* Non-scalar values must be aligned at a byte boundary. */ - accumSize = - (HOST_CHAR_BIT - bit_size % HOST_CHAR_BIT) % HOST_CHAR_BIT; + { + case TYPE_CODE_ARRAY: + case TYPE_CODE_UNION: + case TYPE_CODE_STRUCT: + /* Non-scalar values must be aligned at a byte boundary. */ + accumSize = + (HOST_CHAR_BIT - bit_size % HOST_CHAR_BIT) % HOST_CHAR_BIT; /* And are placed at the beginning (most-significant) bytes * of the target. */ targ = src; - break; - default: + break; + default: accumSize = 0; targ = TYPE_LENGTH (type) - 1; - break; - } + break; + } } - else + else { int sign_bit_offset = (bit_size + bit_offset - 1) % 8; @@ -1516,23 +1464,24 @@ ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, unusedLS = bit_offset; accumSize = 0; - if (has_negatives (type) && (bytes[len-1] & (1 << sign_bit_offset))) + if (has_negatives (type) && (bytes[len - 1] & (1 << sign_bit_offset))) sign = ~0; } - + accum = 0; while (nsrc > 0) { /* Mask for removing bits of the next source byte that are not * part of the value. */ - unsigned int unusedMSMask = - (1 << (srcBitsLeft >= HOST_CHAR_BIT ? HOST_CHAR_BIT : srcBitsLeft))-1; + unsigned int unusedMSMask = + (1 << (srcBitsLeft >= HOST_CHAR_BIT ? HOST_CHAR_BIT : srcBitsLeft)) - + 1; /* Sign-extend bits for this byte. */ unsigned int signMask = sign & ~unusedMSMask; - accum |= + accum |= (((bytes[src] >> unusedLS) & unusedMSMask) | signMask) << accumSize; accumSize += HOST_CHAR_BIT - unusedLS; - if (accumSize >= HOST_CHAR_BIT) + if (accumSize >= HOST_CHAR_BIT) { unpacked[targ] = accum & ~(~0L << HOST_CHAR_BIT); accumSize -= HOST_CHAR_BIT; @@ -1557,12 +1506,12 @@ ada_value_primitive_packed_val (obj, valaddr, offset, bit_offset, return v; } - + /* Move N bits from SOURCE, starting at bit offset SRC_OFFSET to TARGET, starting at bit offset TARG_OFFSET. SOURCE and TARGET must not overlap. */ static void -move_bits (char* target, int targ_offset, char* source, int src_offset, int n) +move_bits (char *target, int targ_offset, char *source, int src_offset, int n) { unsigned int accum, mask; int accum_bits, chunk_size; @@ -1571,13 +1520,13 @@ move_bits (char* target, int targ_offset, char* source, int src_offset, int n) targ_offset %= HOST_CHAR_BIT; source += src_offset / HOST_CHAR_BIT; src_offset %= HOST_CHAR_BIT; - if (BITS_BIG_ENDIAN) + if (BITS_BIG_ENDIAN) { accum = (unsigned char) *source; source += 1; accum_bits = HOST_CHAR_BIT - src_offset; - while (n > 0) + while (n > 0) { int unused_right; accum = (accum << HOST_CHAR_BIT) + (unsigned char) *source; @@ -1588,8 +1537,8 @@ move_bits (char* target, int targ_offset, char* source, int src_offset, int n) chunk_size = n; unused_right = HOST_CHAR_BIT - (chunk_size + targ_offset); mask = ((1 << chunk_size) - 1) << unused_right; - *target = - (*target & ~mask) + *target = + (*target & ~mask) | ((accum >> (accum_bits - chunk_size - unused_right)) & mask); n -= chunk_size; accum_bits -= chunk_size; @@ -1603,7 +1552,7 @@ move_bits (char* target, int targ_offset, char* source, int src_offset, int n) source += 1; accum_bits = HOST_CHAR_BIT - src_offset; - while (n > 0) + while (n > 0) { accum = accum + ((unsigned char) *source << accum_bits); accum_bits += HOST_CHAR_BIT; @@ -1612,8 +1561,7 @@ move_bits (char* target, int targ_offset, char* source, int src_offset, int n) if (chunk_size > n) chunk_size = n; mask = ((1 << chunk_size) - 1) << targ_offset; - *target = - (*target & ~mask) | ((accum << targ_offset) & mask); + *target = (*target & ~mask) | ((accum << targ_offset) & mask); n -= chunk_size; accum_bits -= chunk_size; accum >>= chunk_size; @@ -1629,10 +1577,10 @@ move_bits (char* target, int targ_offset, char* source, int src_offset, int n) FROMVAL. Handles assignment into packed fields that have floating-point or non-scalar types. */ -static struct value* -ada_value_assign (struct value* toval, struct value* fromval) +static struct value * +ada_value_assign (struct value *toval, struct value *fromval) { - struct type* type = VALUE_TYPE (toval); + struct type *type = VALUE_TYPE (toval); int bits = VALUE_BITSIZE (toval); if (!toval->modifiable) @@ -1640,36 +1588,36 @@ ada_value_assign (struct value* toval, struct value* fromval) COERCE_REF (toval); - if (VALUE_LVAL (toval) == lval_memory + if (VALUE_LVAL (toval) == lval_memory && bits > 0 - && (TYPE_CODE (type) == TYPE_CODE_FLT + && (TYPE_CODE (type) == TYPE_CODE_FLT || TYPE_CODE (type) == TYPE_CODE_STRUCT)) { - int len = - (VALUE_BITPOS (toval) + bits + HOST_CHAR_BIT - 1) - / HOST_CHAR_BIT; - char* buffer = (char*) alloca (len); - struct value* val; + int len = + (VALUE_BITPOS (toval) + bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; + char *buffer = (char *) alloca (len); + struct value *val; if (TYPE_CODE (type) == TYPE_CODE_FLT) fromval = value_cast (type, fromval); read_memory (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval), buffer, len); if (BITS_BIG_ENDIAN) - move_bits (buffer, VALUE_BITPOS (toval), - VALUE_CONTENTS (fromval), - TYPE_LENGTH (VALUE_TYPE (fromval)) * TARGET_CHAR_BIT - bits, - bits); + move_bits (buffer, VALUE_BITPOS (toval), + VALUE_CONTENTS (fromval), + TYPE_LENGTH (VALUE_TYPE (fromval)) * TARGET_CHAR_BIT - + bits, bits); else - move_bits (buffer, VALUE_BITPOS (toval), VALUE_CONTENTS (fromval), + move_bits (buffer, VALUE_BITPOS (toval), VALUE_CONTENTS (fromval), 0, bits); - write_memory (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval), buffer, len); + write_memory (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval), buffer, + len); val = value_copy (toval); memcpy (VALUE_CONTENTS_RAW (val), VALUE_CONTENTS (fromval), TYPE_LENGTH (type)); VALUE_TYPE (val) = type; - + return val; } @@ -1681,27 +1629,24 @@ ada_value_assign (struct value* toval, struct value* fromval) ARR may be either a simple array, GNAT array descriptor, or pointer thereto. */ -struct value* -ada_value_subscript (arr, arity, ind) - struct value* arr; - int arity; - struct value** ind; +struct value * +ada_value_subscript (struct value *arr, int arity, struct value **ind) { int k; - struct value* elt; - struct type* elt_type; + struct value *elt; + struct type *elt_type; elt = ada_coerce_to_simple_array (arr); elt_type = check_typedef (VALUE_TYPE (elt)); - if (TYPE_CODE (elt_type) == TYPE_CODE_ARRAY + if (TYPE_CODE (elt_type) == TYPE_CODE_ARRAY && TYPE_FIELD_BITSIZE (elt_type, 0) > 0) return value_subscript_packed (elt, arity, ind); for (k = 0; k < arity; k += 1) { if (TYPE_CODE (elt_type) != TYPE_CODE_ARRAY) - error("too many subscripts (%d expected)", k); + error ("too many subscripts (%d expected)", k); elt = value_subscript (elt, value_pos_atr (ind[k])); } return elt; @@ -1711,26 +1656,23 @@ ada_value_subscript (arr, arity, ind) value of the element of *ARR at the ARITY indices given in IND. Does not read the entire array into memory. */ -struct value* -ada_value_ptr_subscript (arr, type, arity, ind) - struct value* arr; - struct type* type; - int arity; - struct value** ind; +struct value * +ada_value_ptr_subscript (struct value *arr, struct type *type, int arity, + struct value **ind) { int k; for (k = 0; k < arity; k += 1) { LONGEST lwb, upb; - struct value* idx; + struct value *idx; if (TYPE_CODE (type) != TYPE_CODE_ARRAY) - error("too many subscripts (%d expected)", k); - arr = value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)), + error ("too many subscripts (%d expected)", k); + arr = value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)), value_copy (arr)); get_discrete_bounds (TYPE_INDEX_TYPE (type), &lwb, &upb); - if (lwb == 0) + if (lwb == 0) idx = ind[k]; else idx = value_sub (ind[k], value_from_longest (builtin_type_int, lwb)); @@ -1747,8 +1689,7 @@ ada_value_ptr_subscript (arr, type, arity, ind) type designation. Otherwise, returns 0. */ int -ada_array_arity (type) - struct type* type; +ada_array_arity (struct type *type) { int arity; @@ -1758,15 +1699,15 @@ ada_array_arity (type) type = desc_base_type (type); arity = 0; - if (TYPE_CODE (type) == TYPE_CODE_STRUCT) + if (TYPE_CODE (type) == TYPE_CODE_STRUCT) return desc_arity (desc_bounds_type (type)); - else - while (TYPE_CODE (type) == TYPE_CODE_ARRAY) + else + while (TYPE_CODE (type) == TYPE_CODE_ARRAY) { arity += 1; type = check_typedef (TYPE_TARGET_TYPE (type)); } - + return arity; } @@ -1775,29 +1716,27 @@ ada_array_arity (type) TYPE after indexing by NINDICES indices, or by all indices if NINDICES is -1. Otherwise, returns NULL. */ -struct type* -ada_array_element_type (type, nindices) - struct type* type; - int nindices; +struct type * +ada_array_element_type (struct type *type, int nindices) { type = desc_base_type (type); - if (TYPE_CODE (type) == TYPE_CODE_STRUCT) + if (TYPE_CODE (type) == TYPE_CODE_STRUCT) { int k; - struct type* p_array_type; + struct type *p_array_type; p_array_type = desc_data_type (type); k = ada_array_arity (type); if (k == 0) return NULL; - + /* Initially p_array_type = elt_type(*)[]...(k times)...[] */ if (nindices >= 0 && k > nindices) k = nindices; p_array_type = TYPE_TARGET_TYPE (p_array_type); - while (k > 0 && p_array_type != NULL) + while (k > 0 && p_array_type != NULL) { p_array_type = check_typedef (TYPE_TARGET_TYPE (p_array_type)); k -= 1; @@ -1820,10 +1759,8 @@ ada_array_element_type (type, nindices) /* The type of nth index in arrays of given type (n numbering from 1). Does not examine memory. */ -struct type* -ada_index_type (type, n) - struct type* type; - int n; +struct type * +ada_index_type (struct type *type, int n) { type = desc_base_type (type); @@ -1839,7 +1776,7 @@ ada_index_type (type, n) return TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)); } - else + else return desc_index_type (desc_bounds_type (type), n); } @@ -1851,23 +1788,20 @@ ada_index_type (type, n) run-time quantities other than discriminants. */ LONGEST -ada_array_bound_from_type (arr_type, n, which, typep) - struct type* arr_type; - int n; - int which; - struct type** typep; +ada_array_bound_from_type (struct type * arr_type, int n, int which, + struct type ** typep) { - struct type* type; - struct type* index_type_desc; + struct type *type; + struct type *index_type_desc; if (ada_is_packed_array_type (arr_type)) arr_type = decode_packed_array_type (arr_type); - if (arr_type == NULL || ! ada_is_simple_array (arr_type)) + if (arr_type == NULL || !ada_is_simple_array (arr_type)) { if (typep != NULL) *typep = builtin_type_int; - return (LONGEST) -which; + return (LONGEST) - which; } if (TYPE_CODE (arr_type) == TYPE_CODE_PTR) @@ -1876,12 +1810,12 @@ ada_array_bound_from_type (arr_type, n, which, typep) type = arr_type; index_type_desc = ada_find_parallel_type (type, "___XA"); - if (index_type_desc == NULL) + if (index_type_desc == NULL) { - struct type* range_type; - struct type* index_type; + struct type *range_type; + struct type *index_type; - while (n > 1) + while (n > 1) { type = TYPE_TARGET_TYPE (type); n -= 1; @@ -1890,23 +1824,23 @@ ada_array_bound_from_type (arr_type, n, which, typep) range_type = TYPE_INDEX_TYPE (type); index_type = TYPE_TARGET_TYPE (range_type); if (TYPE_CODE (index_type) == TYPE_CODE_UNDEF) - index_type = builtin_type_long; + index_type = builtin_type_long; if (typep != NULL) *typep = index_type; - return - (LONGEST) (which == 0 + return + (LONGEST) (which == 0 ? TYPE_LOW_BOUND (range_type) : TYPE_HIGH_BOUND (range_type)); } - else + else { - struct type* index_type = - to_fixed_range_type (TYPE_FIELD_NAME (index_type_desc, n-1), + struct type *index_type = + to_fixed_range_type (TYPE_FIELD_NAME (index_type_desc, n - 1), NULL, TYPE_OBJFILE (arr_type)); if (typep != NULL) *typep = TYPE_TARGET_TYPE (index_type); - return - (LONGEST) (which == 0 + return + (LONGEST) (which == 0 ? TYPE_LOW_BOUND (index_type) : TYPE_HIGH_BOUND (index_type)); } @@ -1917,19 +1851,19 @@ ada_array_bound_from_type (arr_type, n, which, typep) which is 1. This routine will also work for arrays with bounds supplied by run-time quantities other than discriminants. */ -struct value* +struct value * ada_array_bound (arr, n, which) - struct value* arr; - int n; + struct value *arr; + int n; int which; { - struct type* arr_type = VALUE_TYPE (arr); + struct type *arr_type = VALUE_TYPE (arr); if (ada_is_packed_array_type (arr_type)) return ada_array_bound (decode_packed_array (arr), n, which); - else if (ada_is_simple_array (arr_type)) + else if (ada_is_simple_array (arr_type)) { - struct type* type; + struct type *type; LONGEST v = ada_array_bound_from_type (arr_type, n, which, &type); return value_from_longest (type, v); } @@ -1941,46 +1875,42 @@ ada_array_bound (arr, n, which) nth index. This routine will also work for arrays with bounds supplied by run-time quantities other than discriminants. Does not work for arrays indexed by enumeration types with representation - clauses at the moment. */ + clauses at the moment. */ -struct value* -ada_array_length (arr, n) - struct value* arr; - int n; +struct value * +ada_array_length (struct value *arr, int n) { - struct type* arr_type = check_typedef (VALUE_TYPE (arr)); - struct type* index_type_desc; + struct type *arr_type = check_typedef (VALUE_TYPE (arr)); + struct type *index_type_desc; if (ada_is_packed_array_type (arr_type)) return ada_array_length (decode_packed_array (arr), n); if (ada_is_simple_array (arr_type)) { - struct type* type; + struct type *type; LONGEST v = ada_array_bound_from_type (arr_type, n, 1, &type) - ada_array_bound_from_type (arr_type, n, 0, NULL) + 1; return value_from_longest (type, v); } else - return + return value_from_longest (builtin_type_ada_int, value_as_long (desc_one_bound (desc_bounds (arr), n, 1)) - value_as_long (desc_one_bound (desc_bounds (arr), - n, 0)) - + 1); + n, 0)) + 1); } - + /* Name resolution */ /* The "demangled" name for the user-definable Ada operator corresponding to op. */ -static const char* -ada_op_name (op) - enum exp_opcode op; +static const char * +ada_op_name (enum exp_opcode op) { int i; @@ -2004,9 +1934,7 @@ ada_op_name (op) May change (expand) *EXP. */ void -ada_resolve (expp, context_type) - struct expression** expp; - struct type* context_type; +ada_resolve (struct expression **expp, struct type *context_type) { int pc; pc = 0; @@ -2021,18 +1949,15 @@ ada_resolve (expp, context_type) function-valued variables into parameterless calls. May expand EXP. The CONTEXT_TYPE functions as in ada_resolve, above. */ -static struct value* -ada_resolve_subexp (expp, pos, deprocedure_p, context_type) - struct expression** expp; - int *pos; - int deprocedure_p; - struct type* context_type; +static struct value * +ada_resolve_subexp (struct expression **expp, int *pos, int deprocedure_p, + struct type *context_type) { int pc = *pos; int i; - struct expression* exp; /* Convenience: == *expp */ + struct expression *exp; /* Convenience: == *expp */ enum exp_opcode op = (*expp)->elts[pc].opcode; - struct value** argvec; /* Vector of operand types (alloca'ed). */ + struct value **argvec; /* Vector of operand types (alloca'ed). */ int nargs; /* Number of operands */ argvec = NULL; @@ -2043,7 +1968,7 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) switch (op) { case OP_VAR_VALUE: - /* case OP_UNRESOLVED_VALUE:*/ + /* case OP_UNRESOLVED_VALUE: */ /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ *pos += 4; break; @@ -2051,43 +1976,43 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) case OP_FUNCALL: nargs = longest_to_int (exp->elts[pc + 1].longconst) + 1; /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ - /* if (exp->elts[pc+3].opcode == OP_UNRESOLVED_VALUE) - { - *pos += 7; - - argvec = (struct value* *) alloca (sizeof (struct value*) * (nargs + 1)); - for (i = 0; i < nargs-1; i += 1) - argvec[i] = ada_resolve_subexp (expp, pos, 1, NULL); - argvec[i] = NULL; - } - else - { - *pos += 3; - ada_resolve_subexp (expp, pos, 0, NULL); - for (i = 1; i < nargs; i += 1) - ada_resolve_subexp (expp, pos, 1, NULL); - } - */ + /* if (exp->elts[pc+3].opcode == OP_UNRESOLVED_VALUE) + { + *pos += 7; + + argvec = (struct value* *) alloca (sizeof (struct value*) * (nargs + 1)); + for (i = 0; i < nargs-1; i += 1) + argvec[i] = ada_resolve_subexp (expp, pos, 1, NULL); + argvec[i] = NULL; + } + else + { + *pos += 3; + ada_resolve_subexp (expp, pos, 0, NULL); + for (i = 1; i < nargs; i += 1) + ada_resolve_subexp (expp, pos, 1, NULL); + } + */ exp = *expp; break; /* FIXME: UNOP_QUAL should be defined in expression.h */ /* case UNOP_QUAL: - nargs = 1; - *pos += 3; - ada_resolve_subexp (expp, pos, 1, exp->elts[pc + 1].type); - exp = *expp; - break; - */ - /* FIXME: OP_ATTRIBUTE should be defined in expression.h */ + nargs = 1; + *pos += 3; + ada_resolve_subexp (expp, pos, 1, exp->elts[pc + 1].type); + exp = *expp; + break; + */ + /* FIXME: OP_ATTRIBUTE should be defined in expression.h */ /* case OP_ATTRIBUTE: - nargs = longest_to_int (exp->elts[pc + 1].longconst) + 1; - *pos += 4; - for (i = 0; i < nargs; i += 1) - ada_resolve_subexp (expp, pos, 1, NULL); - exp = *expp; - break; - */ + nargs = longest_to_int (exp->elts[pc + 1].longconst) + 1; + *pos += 4; + for (i = 0; i < nargs; i += 1) + ada_resolve_subexp (expp, pos, 1, NULL); + exp = *expp; + break; + */ case UNOP_ADDR: nargs = 1; *pos += 1; @@ -2097,7 +2022,7 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) case BINOP_ASSIGN: { - struct value* arg1; + struct value *arg1; nargs = 2; *pos += 1; arg1 = ada_resolve_subexp (expp, pos, 0, NULL); @@ -2109,16 +2034,16 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) } default: - switch (op) + switch (op) { default: error ("Unexpected operator during name resolution"); case UNOP_CAST: - /* case UNOP_MBR: - nargs = 1; - *pos += 3; - break; - */ + /* case UNOP_MBR: + nargs = 1; + *pos += 3; + break; + */ case BINOP_ADD: case BINOP_SUB: case BINOP_MUL: @@ -2182,29 +2107,30 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) break; case OP_ARRAY: - *pos += 4; + *pos += 4; nargs = longest_to_int (exp->elts[pc + 2].longconst) + 1; nargs -= longest_to_int (exp->elts[pc + 1].longconst); /* A null array contains one dummy element to give the type. */ - /* if (nargs == 0) - nargs = 1; - break;*/ + /* if (nargs == 0) + nargs = 1; + break; */ case TERNOP_SLICE: /* FIXME: TERNOP_MBR should be defined in expression.h */ - /* case TERNOP_MBR: - *pos += 1; - nargs = 3; - break; - */ + /* case TERNOP_MBR: + *pos += 1; + nargs = 3; + break; + */ /* FIXME: BINOP_MBR should be defined in expression.h */ - /* case BINOP_MBR: - *pos += 3; - nargs = 2; - break;*/ + /* case BINOP_MBR: + *pos += 3; + nargs = 2; + break; */ } - argvec = (struct value* *) alloca (sizeof (struct value*) * (nargs + 1)); + argvec = + (struct value * *) alloca (sizeof (struct value *) * (nargs + 1)); for (i = 0; i < nargs; i += 1) argvec[i] = ada_resolve_subexp (expp, pos, 1, NULL); argvec[i] = NULL; @@ -2220,97 +2146,98 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ /* case OP_UNRESOLVED_VALUE: - { - struct symbol** candidate_syms; - struct block** candidate_blocks; - int n_candidates; - - n_candidates = ada_lookup_symbol_list (exp->elts[pc + 2].name, - exp->elts[pc + 1].block, - VAR_NAMESPACE, - &candidate_syms, - &candidate_blocks); - - if (n_candidates > 1) - {*/ - /* Types tend to get re-introduced locally, so if there - are any local symbols that are not types, first filter - out all types.*/ /* - int j; - for (j = 0; j < n_candidates; j += 1) - switch (SYMBOL_CLASS (candidate_syms[j])) - { - case LOC_REGISTER: - case LOC_ARG: - case LOC_REF_ARG: - case LOC_REGPARM: - case LOC_REGPARM_ADDR: - case LOC_LOCAL: - case LOC_LOCAL_ARG: - case LOC_BASEREG: - case LOC_BASEREG_ARG: - goto FoundNonType; - default: - break; - } - FoundNonType: - if (j < n_candidates) - { - j = 0; - while (j < n_candidates) - { - if (SYMBOL_CLASS (candidate_syms[j]) == LOC_TYPEDEF) - { - candidate_syms[j] = candidate_syms[n_candidates-1]; - candidate_blocks[j] = candidate_blocks[n_candidates-1]; - n_candidates -= 1; - } - else - j += 1; - } - } - } + { + struct symbol** candidate_syms; + struct block** candidate_blocks; + int n_candidates; + + n_candidates = ada_lookup_symbol_list (exp->elts[pc + 2].name, + exp->elts[pc + 1].block, + VAR_NAMESPACE, + &candidate_syms, + &candidate_blocks); + + if (n_candidates > 1) + { */ + /* Types tend to get re-introduced locally, so if there + are any local symbols that are not types, first filter + out all types. *//* + int j; + for (j = 0; j < n_candidates; j += 1) + switch (SYMBOL_CLASS (candidate_syms[j])) + { + case LOC_REGISTER: + case LOC_ARG: + case LOC_REF_ARG: + case LOC_REGPARM: + case LOC_REGPARM_ADDR: + case LOC_LOCAL: + case LOC_LOCAL_ARG: + case LOC_BASEREG: + case LOC_BASEREG_ARG: + goto FoundNonType; + default: + break; + } + FoundNonType: + if (j < n_candidates) + { + j = 0; + while (j < n_candidates) + { + if (SYMBOL_CLASS (candidate_syms[j]) == LOC_TYPEDEF) + { + candidate_syms[j] = candidate_syms[n_candidates-1]; + candidate_blocks[j] = candidate_blocks[n_candidates-1]; + n_candidates -= 1; + } + else + j += 1; + } + } + } - if (n_candidates == 0) - error ("No definition found for %s", - ada_demangle (exp->elts[pc + 2].name)); - else if (n_candidates == 1) - i = 0; - else if (deprocedure_p - && ! is_nonfunction (candidate_syms, n_candidates)) - { - i = ada_resolve_function (candidate_syms, candidate_blocks, - n_candidates, NULL, 0, - exp->elts[pc + 2].name, context_type); - if (i < 0) - error ("Could not find a match for %s", - ada_demangle (exp->elts[pc + 2].name)); - } - else - { - printf_filtered ("Multiple matches for %s\n", - ada_demangle (exp->elts[pc+2].name)); - user_select_syms (candidate_syms, candidate_blocks, - n_candidates, 1); - i = 0; - } + if (n_candidates == 0) + error ("No definition found for %s", + ada_demangle (exp->elts[pc + 2].name)); + else if (n_candidates == 1) + i = 0; + else if (deprocedure_p + && ! is_nonfunction (candidate_syms, n_candidates)) + { + i = ada_resolve_function (candidate_syms, candidate_blocks, + n_candidates, NULL, 0, + exp->elts[pc + 2].name, context_type); + if (i < 0) + error ("Could not find a match for %s", + ada_demangle (exp->elts[pc + 2].name)); + } + else + { + printf_filtered ("Multiple matches for %s\n", + ada_demangle (exp->elts[pc+2].name)); + user_select_syms (candidate_syms, candidate_blocks, + n_candidates, 1); + i = 0; + } - exp->elts[pc].opcode = exp->elts[pc + 3].opcode = OP_VAR_VALUE; - exp->elts[pc + 1].block = candidate_blocks[i]; - exp->elts[pc + 2].symbol = candidate_syms[i]; - if (innermost_block == NULL || - contained_in (candidate_blocks[i], innermost_block)) - innermost_block = candidate_blocks[i]; - }*/ + exp->elts[pc].opcode = exp->elts[pc + 3].opcode = OP_VAR_VALUE; + exp->elts[pc + 1].block = candidate_blocks[i]; + exp->elts[pc + 2].symbol = candidate_syms[i]; + if (innermost_block == NULL || + contained_in (candidate_blocks[i], innermost_block)) + innermost_block = candidate_blocks[i]; + } */ /* FALL THROUGH */ case OP_VAR_VALUE: - if (deprocedure_p && - TYPE_CODE (SYMBOL_TYPE (exp->elts[pc+2].symbol)) == TYPE_CODE_FUNC) + if (deprocedure_p && + TYPE_CODE (SYMBOL_TYPE (exp->elts[pc + 2].symbol)) == + TYPE_CODE_FUNC) { - replace_operator_with_call (expp, pc, 0, 0, - exp->elts[pc+2].symbol, - exp->elts[pc+1].block); + replace_operator_with_call (expp, pc, 0, 0, + exp->elts[pc + 2].symbol, + exp->elts[pc + 1].block); exp = *expp; } break; @@ -2318,37 +2245,37 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) case OP_FUNCALL: { /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ - /* if (exp->elts[pc+3].opcode == OP_UNRESOLVED_VALUE) - { - struct symbol** candidate_syms; - struct block** candidate_blocks; - int n_candidates; - - n_candidates = ada_lookup_symbol_list (exp->elts[pc + 5].name, - exp->elts[pc + 4].block, - VAR_NAMESPACE, - &candidate_syms, - &candidate_blocks); - if (n_candidates == 1) - i = 0; - else - { - i = ada_resolve_function (candidate_syms, candidate_blocks, - n_candidates, argvec, nargs-1, - exp->elts[pc + 5].name, context_type); - if (i < 0) - error ("Could not find a match for %s", - ada_demangle (exp->elts[pc + 5].name)); - } + /* if (exp->elts[pc+3].opcode == OP_UNRESOLVED_VALUE) + { + struct symbol** candidate_syms; + struct block** candidate_blocks; + int n_candidates; + + n_candidates = ada_lookup_symbol_list (exp->elts[pc + 5].name, + exp->elts[pc + 4].block, + VAR_NAMESPACE, + &candidate_syms, + &candidate_blocks); + if (n_candidates == 1) + i = 0; + else + { + i = ada_resolve_function (candidate_syms, candidate_blocks, + n_candidates, argvec, nargs-1, + exp->elts[pc + 5].name, context_type); + if (i < 0) + error ("Could not find a match for %s", + ada_demangle (exp->elts[pc + 5].name)); + } + + exp->elts[pc + 3].opcode = exp->elts[pc + 6].opcode = OP_VAR_VALUE; + exp->elts[pc + 4].block = candidate_blocks[i]; + exp->elts[pc + 5].symbol = candidate_syms[i]; + if (innermost_block == NULL || + contained_in (candidate_blocks[i], innermost_block)) + innermost_block = candidate_blocks[i]; + } */ - exp->elts[pc + 3].opcode = exp->elts[pc + 6].opcode = OP_VAR_VALUE; - exp->elts[pc + 4].block = candidate_blocks[i]; - exp->elts[pc + 5].symbol = candidate_syms[i]; - if (innermost_block == NULL || - contained_in (candidate_blocks[i], innermost_block)) - innermost_block = candidate_blocks[i]; - }*/ - } break; case BINOP_ADD: @@ -2374,18 +2301,18 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) case UNOP_ABS: if (possible_user_operator_p (op, argvec)) { - struct symbol** candidate_syms; - struct block** candidate_blocks; + struct symbol **candidate_syms; + struct block **candidate_blocks; int n_candidates; - n_candidates = ada_lookup_symbol_list (ada_mangle (ada_op_name (op)), - (struct block*) NULL, - VAR_NAMESPACE, - &candidate_syms, - &candidate_blocks); - i = ada_resolve_function (candidate_syms, candidate_blocks, - n_candidates, argvec, nargs, - ada_op_name (op), NULL); + n_candidates = + ada_lookup_symbol_list (ada_mangle (ada_op_name (op)), + (struct block *) NULL, VAR_NAMESPACE, + &candidate_syms, &candidate_blocks); + i = + ada_resolve_function (candidate_syms, candidate_blocks, + n_candidates, argvec, nargs, + ada_op_name (op), NULL); if (i < 0) break; @@ -2402,14 +2329,14 @@ ada_resolve_subexp (expp, pos, deprocedure_p, context_type) /* Return non-zero if formal type FTYPE matches actual type ATYPE. If MAY_DEREF is non-zero, the formal may be a pointer and the actual - a non-pointer. */ + a non-pointer. */ /* The term "match" here is rather loose. The match is heuristic and liberal. FIXME: TOO liberal, in fact. */ static int ada_type_match (ftype, atype, may_deref) - struct type* ftype; - struct type* atype; + struct type *ftype; + struct type *atype; int may_deref; { CHECK_TYPEDEF (ftype); @@ -2420,11 +2347,11 @@ ada_type_match (ftype, atype, may_deref) if (TYPE_CODE (atype) == TYPE_CODE_REF) atype = TYPE_TARGET_TYPE (atype); - if (TYPE_CODE (ftype) == TYPE_CODE_VOID + if (TYPE_CODE (ftype) == TYPE_CODE_VOID || TYPE_CODE (atype) == TYPE_CODE_VOID) return 1; - switch (TYPE_CODE (ftype)) + switch (TYPE_CODE (ftype)) { default: return 1; @@ -2432,8 +2359,9 @@ ada_type_match (ftype, atype, may_deref) if (TYPE_CODE (atype) == TYPE_CODE_PTR) return ada_type_match (TYPE_TARGET_TYPE (ftype), TYPE_TARGET_TYPE (atype), 0); - else return (may_deref && - ada_type_match (TYPE_TARGET_TYPE (ftype), atype, 0)); + else + return (may_deref && + ada_type_match (TYPE_TARGET_TYPE (ftype), atype, 0)); case TYPE_CODE_INT: case TYPE_CODE_ENUM: case TYPE_CODE_RANGE: @@ -2448,16 +2376,16 @@ ada_type_match (ftype, atype, may_deref) } case TYPE_CODE_ARRAY: - return (TYPE_CODE (atype) == TYPE_CODE_ARRAY + return (TYPE_CODE (atype) == TYPE_CODE_ARRAY || ada_is_array_descriptor (atype)); case TYPE_CODE_STRUCT: if (ada_is_array_descriptor (ftype)) - return (TYPE_CODE (atype) == TYPE_CODE_ARRAY + return (TYPE_CODE (atype) == TYPE_CODE_ARRAY || ada_is_array_descriptor (atype)); else return (TYPE_CODE (atype) == TYPE_CODE_STRUCT - && ! ada_is_array_descriptor (atype)); + && !ada_is_array_descriptor (atype)); case TYPE_CODE_UNION: case TYPE_CODE_FLT: @@ -2471,15 +2399,12 @@ ada_type_match (ftype, atype, may_deref) argument function. */ static int -ada_args_match (func, actuals, n_actuals) - struct symbol* func; - struct value** actuals; - int n_actuals; +ada_args_match (struct symbol *func, struct value **actuals, int n_actuals) { int i; - struct type* func_type = SYMBOL_TYPE (func); + struct type *func_type = SYMBOL_TYPE (func); - if (SYMBOL_CLASS (func) == LOC_CONST && + if (SYMBOL_CLASS (func) == LOC_CONST && TYPE_CODE (func_type) == TYPE_CODE_ENUM) return (n_actuals == 0); else if (func_type == NULL || TYPE_CODE (func_type) != TYPE_CODE_FUNC) @@ -2490,11 +2415,11 @@ ada_args_match (func, actuals, n_actuals) for (i = 0; i < n_actuals; i += 1) { - struct type* ftype = check_typedef (TYPE_FIELD_TYPE (func_type, i)); - struct type* atype = check_typedef (VALUE_TYPE (actuals[i])); + struct type *ftype = check_typedef (TYPE_FIELD_TYPE (func_type, i)); + struct type *atype = check_typedef (VALUE_TYPE (actuals[i])); - if (! ada_type_match (TYPE_FIELD_TYPE (func_type, i), - VALUE_TYPE (actuals[i]), 1)) + if (!ada_type_match (TYPE_FIELD_TYPE (func_type, i), + VALUE_TYPE (actuals[i]), 1)) return 0; } return 1; @@ -2506,25 +2431,23 @@ ada_args_match (func, actuals, n_actuals) or an enumerated type. A null CONTEXT_TYPE indicates any non-void type. */ static int -return_match (func_type, context_type) - struct type* func_type; - struct type* context_type; +return_match (struct type *func_type, struct type *context_type) { - struct type* return_type; + struct type *return_type; if (func_type == NULL) return 1; /* FIXME: base_type should be declared in gdbtypes.h, implemented in valarith.c */ /* if (TYPE_CODE (func_type) == TYPE_CODE_FUNC) - return_type = base_type (TYPE_TARGET_TYPE (func_type)); - else - return_type = base_type (func_type);*/ + return_type = base_type (TYPE_TARGET_TYPE (func_type)); + else + return_type = base_type (func_type); */ if (return_type == NULL) return 1; /* FIXME: base_type should be declared in gdbtypes.h, implemented in valarith.c */ - /* context_type = base_type (context_type);*/ + /* context_type = base_type (context_type); */ if (TYPE_CODE (return_type) == TYPE_CODE_ENUM) return context_type == NULL || return_type == context_type; @@ -2547,18 +2470,14 @@ return_match (func_type, context_type) is modified in parallel to SYMS. */ int -ada_resolve_function (syms, blocks, nsyms, args, nargs, name, context_type) - struct symbol* syms[]; - struct block* blocks[]; - struct value** args; - int nsyms, nargs; - const char* name; - struct type* context_type; +ada_resolve_function (struct symbol *syms[], struct block *blocks[], + int nsyms, struct value **args, int nargs, + const char *name, struct type *context_type) { int k; int m; /* Number of hits */ - struct type* fallback; - struct type* return_type; + struct type *fallback; + struct type *return_type; return_type = context_type; if (context_type == NULL) @@ -2566,12 +2485,12 @@ ada_resolve_function (syms, blocks, nsyms, args, nargs, name, context_type) else fallback = NULL; - m = 0; + m = 0; while (1) { for (k = 0; k < nsyms; k += 1) { - struct type* type = check_typedef (SYMBOL_TYPE (syms[k])); + struct type *type = check_typedef (SYMBOL_TYPE (syms[k])); if (ada_args_match (syms[k], args, nargs) && return_match (SYMBOL_TYPE (syms[k]), return_type)) @@ -2605,7 +2524,7 @@ ada_resolve_function (syms, blocks, nsyms, args, nargs, name, context_type) /* same package should sort in their source order. We settle for ordering */ /* such symbols by their trailing number (__N or $N). */ static int -mangled_ordered_before (char* N0, char* N1) +mangled_ordered_before (char *N0, char *N1) { if (N1 == NULL) return 0; @@ -2614,53 +2533,50 @@ mangled_ordered_before (char* N0, char* N1) else { int k0, k1; - for (k0 = strlen (N0)-1; k0 > 0 && isdigit (N0[k0]); k0 -= 1) + for (k0 = strlen (N0) - 1; k0 > 0 && isdigit (N0[k0]); k0 -= 1) ; - for (k1 = strlen (N1)-1; k1 > 0 && isdigit (N1[k1]); k1 -= 1) + for (k1 = strlen (N1) - 1; k1 > 0 && isdigit (N1[k1]); k1 -= 1) ; - if ((N0[k0] == '_' || N0[k0] == '$') && N0[k0+1] != '\000' - && (N1[k1] == '_' || N1[k1] == '$') && N1[k1+1] != '\000') + if ((N0[k0] == '_' || N0[k0] == '$') && N0[k0 + 1] != '\000' + && (N1[k1] == '_' || N1[k1] == '$') && N1[k1 + 1] != '\000') { int n0, n1; n0 = k0; - while (N0[n0] == '_' && n0 > 0 && N0[n0-1] == '_') + while (N0[n0] == '_' && n0 > 0 && N0[n0 - 1] == '_') n0 -= 1; n1 = k1; - while (N1[n1] == '_' && n1 > 0 && N1[n1-1] == '_') + while (N1[n1] == '_' && n1 > 0 && N1[n1 - 1] == '_') n1 -= 1; if (n0 == n1 && STREQN (N0, N1, n0)) - return (atoi (N0+k0+1) < atoi (N1+k1+1)); + return (atoi (N0 + k0 + 1) < atoi (N1 + k1 + 1)); } return (strcmp (N0, N1) < 0); } } - + /* Sort SYMS[0..NSYMS-1] to put the choices in a canonical order by their */ /* mangled names, rearranging BLOCKS[0..NSYMS-1] according to the same */ /* permutation. */ -static void -sort_choices (syms, blocks, nsyms) - struct symbol* syms[]; - struct block* blocks[]; - int nsyms; +static void +sort_choices (struct symbol *syms[], struct block *blocks[], int nsyms) { int i, j; - for (i = 1; i < nsyms; i += 1) + for (i = 1; i < nsyms; i += 1) { - struct symbol* sym = syms[i]; - struct block* block = blocks[i]; + struct symbol *sym = syms[i]; + struct block *block = blocks[i]; int j; - for (j = i-1; j >= 0; j -= 1) + for (j = i - 1; j >= 0; j -= 1) { if (mangled_ordered_before (SYMBOL_NAME (syms[j]), SYMBOL_NAME (sym))) break; - syms[j+1] = syms[j]; - blocks[j+1] = blocks[j]; + syms[j + 1] = syms[j]; + blocks[j + 1] = blocks[j]; } - syms[j+1] = sym; - blocks[j+1] = block; + syms[j + 1] = sym; + blocks[j + 1] = block; } } @@ -2675,14 +2591,11 @@ sort_choices (syms, blocks, nsyms) to be re-integrated one of these days. */ int -user_select_syms (syms, blocks, nsyms, max_results) - struct symbol* syms[]; - struct block* blocks[]; - int nsyms; - int max_results; +user_select_syms (struct symbol *syms[], struct block *blocks[], int nsyms, + int max_results) { int i; - int* chosen = (int*) alloca (sizeof(int) * nsyms); + int *chosen = (int *) alloca (sizeof (int) * nsyms); int n_chosen; int first_choice = (max_results == 1) ? 1 : 2; @@ -2691,9 +2604,9 @@ user_select_syms (syms, blocks, nsyms, max_results) if (nsyms <= 1) return nsyms; - printf_unfiltered("[0] cancel\n"); + printf_unfiltered ("[0] cancel\n"); if (max_results > 1) - printf_unfiltered("[1] all\n"); + printf_unfiltered ("[1] all\n"); sort_choices (syms, blocks, nsyms); @@ -2706,30 +2619,27 @@ user_select_syms (syms, blocks, nsyms, max_results) { struct symtab_and_line sal = find_function_start_sal (syms[i], 1); printf_unfiltered ("[%d] %s at %s:%d\n", - i + first_choice, + i + first_choice, SYMBOL_SOURCE_NAME (syms[i]), - sal.symtab == NULL - ? "<no source file available>" - : sal.symtab->filename, - sal.line); + sal.symtab == NULL + ? "<no source file available>" + : sal.symtab->filename, sal.line); continue; } - else + else { - int is_enumeral = + int is_enumeral = (SYMBOL_CLASS (syms[i]) == LOC_CONST && SYMBOL_TYPE (syms[i]) != NULL - && TYPE_CODE (SYMBOL_TYPE (syms[i])) - == TYPE_CODE_ENUM); - struct symtab* symtab = symtab_for_sym (syms[i]); + && TYPE_CODE (SYMBOL_TYPE (syms[i])) == TYPE_CODE_ENUM); + struct symtab *symtab = symtab_for_sym (syms[i]); if (SYMBOL_LINE (syms[i]) != 0 && symtab != NULL) printf_unfiltered ("[%d] %s at %s:%d\n", i + first_choice, SYMBOL_SOURCE_NAME (syms[i]), symtab->filename, SYMBOL_LINE (syms[i])); - else if (is_enumeral && - TYPE_NAME (SYMBOL_TYPE (syms[i])) != NULL) + else if (is_enumeral && TYPE_NAME (SYMBOL_TYPE (syms[i])) != NULL) { printf_unfiltered ("[%d] ", i + first_choice); ada_print_type (SYMBOL_TYPE (syms[i]), NULL, gdb_stdout, -1, 0); @@ -2737,7 +2647,7 @@ user_select_syms (syms, blocks, nsyms, max_results) SYMBOL_SOURCE_NAME (syms[i])); } else if (symtab != NULL) - printf_unfiltered (is_enumeral + printf_unfiltered (is_enumeral ? "[%d] %s in %s (enumeral)\n" : "[%d] %s at %s:?\n", i + first_choice, @@ -2747,17 +2657,18 @@ user_select_syms (syms, blocks, nsyms, max_results) printf_unfiltered (is_enumeral ? "[%d] %s (enumeral)\n" : "[%d] %s at ?\n", - i + first_choice, SYMBOL_SOURCE_NAME (syms[i])); + i + first_choice, + SYMBOL_SOURCE_NAME (syms[i])); } } - + n_chosen = get_selections (chosen, nsyms, max_results, max_results > 1, "overload-choice"); for (i = 0; i < n_chosen; i += 1) { syms[i] = syms[chosen[i]]; - if (blocks != NULL) + if (blocks != NULL) blocks[i] = blocks[chosen[i]]; } @@ -2781,20 +2692,15 @@ user_select_syms (syms, blocks, nsyms, max_results) prompts (for use with the -f switch). */ int -get_selections (choices, n_choices, max_results, is_all_choice, - annotation_suffix) - int* choices; - int n_choices; - int max_results; - int is_all_choice; - char* annotation_suffix; +get_selections (int *choices, int n_choices, int max_results, + int is_all_choice, char *annotation_suffix) { int i; - char* args; - const char* prompt; + char *args; + const char *prompt; int n_chosen; int first_choice = is_all_choice ? 2 : 1; - + prompt = getenv ("PS2"); if (prompt == NULL) prompt = ">"; @@ -2803,7 +2709,7 @@ get_selections (choices, n_choices, max_results, is_all_choice, gdb_flush (gdb_stdout); args = command_line_input ((char *) NULL, 0, annotation_suffix); - + if (args == NULL) error_no_arg ("one or more choice numbers"); @@ -2813,7 +2719,7 @@ get_selections (choices, n_choices, max_results, is_all_choice, order, as given in args. Choices are validated. */ while (1) { - char* args2; + char *args2; int choice, j; while (isspace (*args)) @@ -2824,11 +2730,12 @@ get_selections (choices, n_choices, max_results, is_all_choice, break; choice = strtol (args, &args2, 10); - if (args == args2 || choice < 0 || choice > n_choices + first_choice - 1) + if (args == args2 || choice < 0 + || choice > n_choices + first_choice - 1) error ("Argument must be choice number"); args = args2; - if (choice == 0) + if (choice == 0) error ("cancelled"); if (choice < first_choice) @@ -2840,22 +2747,23 @@ get_selections (choices, n_choices, max_results, is_all_choice, } choice -= first_choice; - for (j = n_chosen-1; j >= 0 && choice < choices[j]; j -= 1) - {} + for (j = n_chosen - 1; j >= 0 && choice < choices[j]; j -= 1) + { + } if (j < 0 || choice != choices[j]) { int k; - for (k = n_chosen-1; k > j; k -= 1) - choices[k+1] = choices[k]; - choices[j+1] = choice; + for (k = n_chosen - 1; k > j; k -= 1) + choices[k + 1] = choices[k]; + choices[j + 1] = choice; n_chosen += 1; } } if (n_chosen > max_results) error ("Select no more than %d of the above", max_results); - + return n_chosen; } @@ -2864,23 +2772,21 @@ get_selections (choices, n_choices, max_results, is_all_choice, /* arguments. Update *EXPP as needed to hold more space. */ static void -replace_operator_with_call (expp, pc, nargs, oplen, sym, block) - struct expression** expp; - int pc, nargs, oplen; - struct symbol* sym; - struct block* block; +replace_operator_with_call (struct expression **expp, int pc, int nargs, + int oplen, struct symbol *sym, + struct block *block) { /* A new expression, with 6 more elements (3 for funcall, 4 for function symbol, -oplen for operator being replaced). */ - struct expression* newexp = (struct expression*) + struct expression *newexp = (struct expression *) xmalloc (sizeof (struct expression) + EXP_ELEM_TO_BYTES ((*expp)->nelts + 7 - oplen)); - struct expression* exp = *expp; + struct expression *exp = *expp; newexp->nelts = exp->nelts + 7 - oplen; newexp->language_defn = exp->language_defn; memcpy (newexp->elts, exp->elts, EXP_ELEM_TO_BYTES (pc)); - memcpy (newexp->elts + pc + 7, exp->elts + pc + oplen, + memcpy (newexp->elts + pc + 7, exp->elts + pc + oplen, EXP_ELEM_TO_BYTES (exp->nelts - pc - oplen)); newexp->elts[pc].opcode = newexp->elts[pc + 2].opcode = OP_FUNCALL; @@ -2891,8 +2797,8 @@ replace_operator_with_call (expp, pc, nargs, oplen, sym, block) newexp->elts[pc + 5].symbol = sym; *expp = newexp; - free (exp); -} + xfree (exp); +} /* Type-class predicates */ @@ -2900,89 +2806,89 @@ replace_operator_with_call (expp, pc, nargs, oplen, sym, block) /* FLOAT.) */ static int -numeric_type_p (type) - struct type* type; +numeric_type_p (struct type *type) { if (type == NULL) return 0; - else { - switch (TYPE_CODE (type)) - { - case TYPE_CODE_INT: - case TYPE_CODE_FLT: - return 1; - case TYPE_CODE_RANGE: - return (type == TYPE_TARGET_TYPE (type) - || numeric_type_p (TYPE_TARGET_TYPE (type))); - default: - return 0; - } - } + else + { + switch (TYPE_CODE (type)) + { + case TYPE_CODE_INT: + case TYPE_CODE_FLT: + return 1; + case TYPE_CODE_RANGE: + return (type == TYPE_TARGET_TYPE (type) + || numeric_type_p (TYPE_TARGET_TYPE (type))); + default: + return 0; + } + } } /* True iff TYPE is integral (an INT or RANGE of INTs). */ static int -integer_type_p (type) - struct type* type; +integer_type_p (struct type *type) { if (type == NULL) return 0; - else { - switch (TYPE_CODE (type)) - { - case TYPE_CODE_INT: - return 1; - case TYPE_CODE_RANGE: - return (type == TYPE_TARGET_TYPE (type) - || integer_type_p (TYPE_TARGET_TYPE (type))); - default: - return 0; - } - } + else + { + switch (TYPE_CODE (type)) + { + case TYPE_CODE_INT: + return 1; + case TYPE_CODE_RANGE: + return (type == TYPE_TARGET_TYPE (type) + || integer_type_p (TYPE_TARGET_TYPE (type))); + default: + return 0; + } + } } /* True iff TYPE is scalar (INT, RANGE, FLOAT, ENUM). */ static int -scalar_type_p (type) - struct type* type; +scalar_type_p (struct type *type) { if (type == NULL) return 0; - else { - switch (TYPE_CODE (type)) - { - case TYPE_CODE_INT: - case TYPE_CODE_RANGE: - case TYPE_CODE_ENUM: - case TYPE_CODE_FLT: - return 1; - default: - return 0; - } - } + else + { + switch (TYPE_CODE (type)) + { + case TYPE_CODE_INT: + case TYPE_CODE_RANGE: + case TYPE_CODE_ENUM: + case TYPE_CODE_FLT: + return 1; + default: + return 0; + } + } } /* True iff TYPE is discrete (INT, RANGE, ENUM). */ static int -discrete_type_p (type) - struct type* type; +discrete_type_p (struct type *type) { if (type == NULL) return 0; - else { - switch (TYPE_CODE (type)) - { - case TYPE_CODE_INT: - case TYPE_CODE_RANGE: - case TYPE_CODE_ENUM: - return 1; - default: - return 0; - } - } + else + { + switch (TYPE_CODE (type)) + { + case TYPE_CODE_INT: + case TYPE_CODE_RANGE: + case TYPE_CODE_ENUM: + return 1; + default: + return 0; + } + } } /* Returns non-zero if OP with operatands in the vector ARGS could be @@ -2990,14 +2896,12 @@ discrete_type_p (type) (i.e., result 0). */ static int -possible_user_operator_p (op, args) - enum exp_opcode op; - struct value* args[]; +possible_user_operator_p (enum exp_opcode op, struct value *args[]) { - struct type* type0 = check_typedef (VALUE_TYPE (args[0])); - struct type* type1 = + struct type *type0 = check_typedef (VALUE_TYPE (args[0])); + struct type *type1 = (args[1] == NULL) ? NULL : check_typedef (VALUE_TYPE (args[1])); - + switch (op) { default: @@ -3007,14 +2911,14 @@ possible_user_operator_p (op, args) case BINOP_SUB: case BINOP_MUL: case BINOP_DIV: - return (! (numeric_type_p (type0) && numeric_type_p (type1))); + return (!(numeric_type_p (type0) && numeric_type_p (type1))); case BINOP_REM: case BINOP_MOD: case BINOP_BITWISE_AND: case BINOP_BITWISE_IOR: case BINOP_BITWISE_XOR: - return (! (integer_type_p (type0) && integer_type_p (type1))); + return (!(integer_type_p (type0) && integer_type_p (type1))); case BINOP_EQUAL: case BINOP_NOTEQUAL: @@ -3022,26 +2926,25 @@ possible_user_operator_p (op, args) case BINOP_GTR: case BINOP_LEQ: case BINOP_GEQ: - return (! (scalar_type_p (type0) && scalar_type_p (type1))); + return (!(scalar_type_p (type0) && scalar_type_p (type1))); case BINOP_CONCAT: - return ((TYPE_CODE (type0) != TYPE_CODE_ARRAY && - (TYPE_CODE (type0) != TYPE_CODE_PTR || - TYPE_CODE (TYPE_TARGET_TYPE (type0)) - != TYPE_CODE_ARRAY)) - || (TYPE_CODE (type1) != TYPE_CODE_ARRAY && - (TYPE_CODE (type1) != TYPE_CODE_PTR || - TYPE_CODE (TYPE_TARGET_TYPE (type1)) - != TYPE_CODE_ARRAY))); + return ((TYPE_CODE (type0) != TYPE_CODE_ARRAY && + (TYPE_CODE (type0) != TYPE_CODE_PTR || + TYPE_CODE (TYPE_TARGET_TYPE (type0)) + != TYPE_CODE_ARRAY)) + || (TYPE_CODE (type1) != TYPE_CODE_ARRAY && + (TYPE_CODE (type1) != TYPE_CODE_PTR || + TYPE_CODE (TYPE_TARGET_TYPE (type1)) != TYPE_CODE_ARRAY))); case BINOP_EXP: - return (! (numeric_type_p (type0) && integer_type_p (type1))); + return (!(numeric_type_p (type0) && integer_type_p (type1))); case UNOP_NEG: case UNOP_PLUS: case UNOP_LOGICAL_NOT: - case UNOP_ABS: - return (! numeric_type_p (type0)); + case UNOP_ABS: + return (!numeric_type_p (type0)); } } @@ -3056,16 +2959,15 @@ possible_user_operator_p (op, args) * is XR for an object renaming, XRP for a procedure renaming, XRE for * an exception renaming, and XRS for a subprogram renaming. Returns * NULL if NAME encodes none of these. */ -const char* -ada_renaming_type (type) - struct type* type; +const char * +ada_renaming_type (struct type *type) { if (type != NULL && TYPE_CODE (type) == TYPE_CODE_ENUM) { - const char* name = type_name_no_tag (type); - const char* suffix = (name == NULL) ? NULL : strstr (name, "___XR"); - if (suffix == NULL - || (suffix[5] != '\000' && strchr ("PES_", suffix[5]) == NULL)) + const char *name = type_name_no_tag (type); + const char *suffix = (name == NULL) ? NULL : strstr (name, "___XR"); + if (suffix == NULL + || (suffix[5] != '\000' && strchr ("PES_", suffix[5]) == NULL)) return NULL; else return suffix + 3; @@ -3076,25 +2978,23 @@ ada_renaming_type (type) /* Return non-zero iff SYM encodes an object renaming. */ int -ada_is_object_renaming (sym) - struct symbol* sym; +ada_is_object_renaming (struct symbol *sym) { - const char* renaming_type = ada_renaming_type (SYMBOL_TYPE (sym)); - return renaming_type != NULL + const char *renaming_type = ada_renaming_type (SYMBOL_TYPE (sym)); + return renaming_type != NULL && (renaming_type[2] == '\0' || renaming_type[2] == '_'); } /* Assuming that SYM encodes a non-object renaming, returns the original * name of the renamed entity. The name is good until the end of * parsing. */ -const char* -ada_simple_renamed_entity (sym) - struct symbol* sym; +const char * +ada_simple_renamed_entity (struct symbol *sym) { - struct type* type; - const char* raw_name; + struct type *type; + const char *raw_name; int len; - char* result; + char *result; type = SYMBOL_TYPE (sym); if (type == NULL || TYPE_NFIELDS (type) < 1) @@ -3106,31 +3006,30 @@ ada_simple_renamed_entity (sym) error ("Improperly encoded renaming."); result = xmalloc (len + 1); - /* FIXME: add_name_string_cleanup should be defined in parse.c */ - /* add_name_string_cleanup (result);*/ + /* FIXME: add_name_string_cleanup should be defined in parse.c */ + /* add_name_string_cleanup (result); */ strncpy (result, raw_name, len); result[len] = '\000'; return result; } - + /* Evaluation: Function Calls */ /* Copy VAL onto the stack, using and updating *SP as the stack pointer. Return VAL as an lvalue. */ -static struct value* -place_on_stack (val, sp) - struct value* val; - CORE_ADDR* sp; +static struct value * +place_on_stack (struct value *val, CORE_ADDR *sp) { CORE_ADDR old_sp = *sp; #ifdef STACK_ALIGN - *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val), - STACK_ALIGN (TYPE_LENGTH (check_typedef (VALUE_TYPE (val))))); + *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val), + STACK_ALIGN (TYPE_LENGTH + (check_typedef (VALUE_TYPE (val))))); #else - *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val), + *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val), TYPE_LENGTH (check_typedef (VALUE_TYPE (val)))); #endif @@ -3146,22 +3045,20 @@ place_on_stack (val, sp) /* Return the value ACTUAL, converted to be an appropriate value for a formal of type FORMAL_TYPE. Use *SP as a stack pointer for allocating any necessary descriptors (fat pointers), or copies of - values not residing in memory, updating it as needed. */ - -static struct value* -convert_actual (actual, formal_type0, sp) - struct value* actual; - struct type* formal_type0; - CORE_ADDR* sp; -{ - struct type* actual_type = check_typedef (VALUE_TYPE (actual)); - struct type* formal_type = check_typedef (formal_type0); - struct type* formal_target = - TYPE_CODE (formal_type) == TYPE_CODE_PTR - ? check_typedef (TYPE_TARGET_TYPE (formal_type)) : formal_type; - struct type* actual_target = - TYPE_CODE (actual_type) == TYPE_CODE_PTR - ? check_typedef (TYPE_TARGET_TYPE (actual_type)) : actual_type; + values not residing in memory, updating it as needed. */ + +static struct value * +convert_actual (struct value *actual, struct type *formal_type0, + CORE_ADDR *sp) +{ + struct type *actual_type = check_typedef (VALUE_TYPE (actual)); + struct type *formal_type = check_typedef (formal_type0); + struct type *formal_target = + TYPE_CODE (formal_type) == TYPE_CODE_PTR + ? check_typedef (TYPE_TARGET_TYPE (formal_type)) : formal_type; + struct type *actual_target = + TYPE_CODE (actual_type) == TYPE_CODE_PTR + ? check_typedef (TYPE_TARGET_TYPE (actual_type)) : actual_type; if (ada_is_array_descriptor (formal_target) && TYPE_CODE (actual_target) == TYPE_CODE_ARRAY) @@ -3169,17 +3066,17 @@ convert_actual (actual, formal_type0, sp) else if (TYPE_CODE (formal_type) == TYPE_CODE_PTR) { if (TYPE_CODE (formal_target) == TYPE_CODE_ARRAY - && ada_is_array_descriptor (actual_target)) + && ada_is_array_descriptor (actual_target)) return desc_data (actual); else if (TYPE_CODE (actual_type) != TYPE_CODE_PTR) { if (VALUE_LVAL (actual) != lval_memory) { - struct value* val; + struct value *val; actual_type = check_typedef (VALUE_TYPE (actual)); val = allocate_value (actual_type); - memcpy ((char*) VALUE_CONTENTS_RAW (val), - (char*) VALUE_CONTENTS (actual), + memcpy ((char *) VALUE_CONTENTS_RAW (val), + (char *) VALUE_CONTENTS (actual), TYPE_LENGTH (actual_type)); actual = place_on_stack (val, sp); } @@ -3199,33 +3096,30 @@ convert_actual (actual, formal_type0, sp) to-descriptor type rather than a descriptor type), a struct value* representing a pointer to this descriptor. */ -static struct value* -make_array_descriptor (type, arr, sp) - struct type* type; - struct value* arr; - CORE_ADDR* sp; +static struct value * +make_array_descriptor (struct type *type, struct value *arr, CORE_ADDR *sp) { - struct type* bounds_type = desc_bounds_type (type); - struct type* desc_type = desc_base_type (type); - struct value* descriptor = allocate_value (desc_type); - struct value* bounds = allocate_value (bounds_type); + struct type *bounds_type = desc_bounds_type (type); + struct type *desc_type = desc_base_type (type); + struct value *descriptor = allocate_value (desc_type); + struct value *bounds = allocate_value (bounds_type); CORE_ADDR bounds_addr; int i; - + for (i = ada_array_arity (check_typedef (VALUE_TYPE (arr))); i > 0; i -= 1) { modify_general_field (VALUE_CONTENTS (bounds), - value_as_long (ada_array_bound (arr, i, 0)), + value_as_long (ada_array_bound (arr, i, 0)), desc_bound_bitpos (bounds_type, i, 0), desc_bound_bitsize (bounds_type, i, 0)); modify_general_field (VALUE_CONTENTS (bounds), - value_as_long (ada_array_bound (arr, i, 1)), + value_as_long (ada_array_bound (arr, i, 1)), desc_bound_bitpos (bounds_type, i, 1), desc_bound_bitsize (bounds_type, i, 1)); } - + bounds = place_on_stack (bounds, sp); - + modify_general_field (VALUE_CONTENTS (descriptor), arr, fat_pntr_data_bitpos (desc_type), @@ -3253,26 +3147,21 @@ make_array_descriptor (type, arr, sp) value as needed. */ void -ada_convert_actuals (func, nargs, args, sp) - struct value* func; - int nargs; - struct value* args[]; - CORE_ADDR* sp; +ada_convert_actuals (struct value *func, int nargs, struct value *args[], + CORE_ADDR *sp) { int i; - if (TYPE_NFIELDS (VALUE_TYPE (func)) == 0 + if (TYPE_NFIELDS (VALUE_TYPE (func)) == 0 || nargs != TYPE_NFIELDS (VALUE_TYPE (func))) return; for (i = 0; i < nargs; i += 1) - args[i] = - convert_actual (args[i], - TYPE_FIELD_TYPE (VALUE_TYPE (func), i), - sp); + args[i] = + convert_actual (args[i], TYPE_FIELD_TYPE (VALUE_TYPE (func), i), sp); } - + /* Symbol Lookup */ @@ -3280,36 +3169,32 @@ ada_convert_actuals (func, nargs, args, sp) /* ada_lookup_symbol_list. */ /* Current size of defn_symbols and defn_blocks */ -static size_t defn_vector_size = 0; +static size_t defn_vector_size = 0; /* Current number of symbols found. */ static int ndefns = 0; -static struct symbol** defn_symbols = NULL; -static struct block** defn_blocks = NULL; +static struct symbol **defn_symbols = NULL; +static struct block **defn_blocks = NULL; /* Return the result of a standard (literal, C-like) lookup of NAME in * given NAMESPACE. */ -static struct symbol* -standard_lookup (name, namespace) - const char* name; - namespace_enum namespace; +static struct symbol * +standard_lookup (const char *name, namespace_enum namespace) { - struct symbol* sym; - struct symtab* symtab; - sym = lookup_symbol (name, (struct block*) NULL, namespace, 0, &symtab); + struct symbol *sym; + struct symtab *symtab; + sym = lookup_symbol (name, (struct block *) NULL, namespace, 0, &symtab); return sym; } - + /* Non-zero iff there is at least one non-function/non-enumeral symbol */ /* in SYMS[0..N-1]. We treat enumerals as functions, since they */ -/* contend in overloading in the same way. */ +/* contend in overloading in the same way. */ static int -is_nonfunction (syms, n) - struct symbol* syms[]; - int n; +is_nonfunction (struct symbol *syms[], int n) { int i; @@ -3325,21 +3210,19 @@ is_nonfunction (syms, n) struct types. Otherwise, they may not. */ static int -equiv_types (type0, type1) - struct type* type0; - struct type* type1; +equiv_types (struct type *type0, struct type *type1) { - if (type0 == type1) + if (type0 == type1) return 1; - if (type0 == NULL || type1 == NULL + if (type0 == NULL || type1 == NULL || TYPE_CODE (type0) != TYPE_CODE (type1)) return 0; - if ((TYPE_CODE (type0) == TYPE_CODE_STRUCT + if ((TYPE_CODE (type0) == TYPE_CODE_STRUCT || TYPE_CODE (type0) == TYPE_CODE_ENUM) && ada_type_name (type0) != NULL && ada_type_name (type1) != NULL && STREQ (ada_type_name (type0), ada_type_name (type1))) return 1; - + return 0; } @@ -3347,9 +3230,7 @@ equiv_types (type0, type1) no more defined than that of SYM1. */ static int -lesseq_defined_than (sym0, sym1) - struct symbol* sym0; - struct symbol* sym1; +lesseq_defined_than (struct symbol *sym0, struct symbol *sym1) { if (sym0 == sym1) return 1; @@ -3357,18 +3238,18 @@ lesseq_defined_than (sym0, sym1) || SYMBOL_CLASS (sym0) != SYMBOL_CLASS (sym1)) return 0; - switch (SYMBOL_CLASS (sym0)) + switch (SYMBOL_CLASS (sym0)) { case LOC_UNDEF: return 1; case LOC_TYPEDEF: { - struct type* type0 = SYMBOL_TYPE (sym0); - struct type* type1 = SYMBOL_TYPE (sym1); - char* name0 = SYMBOL_NAME (sym0); - char* name1 = SYMBOL_NAME (sym1); + struct type *type0 = SYMBOL_TYPE (sym0); + struct type *type1 = SYMBOL_TYPE (sym1); + char *name0 = SYMBOL_NAME (sym0); + char *name1 = SYMBOL_NAME (sym1); int len0 = strlen (name0); - return + return TYPE_CODE (type0) == TYPE_CODE (type1) && (equiv_types (type0, type1) || (len0 < strlen (name1) && STREQN (name0, name1, len0) @@ -3377,8 +3258,8 @@ lesseq_defined_than (sym0, sym1) case LOC_CONST: return SYMBOL_VALUE (sym0) == SYMBOL_VALUE (sym1) && equiv_types (SYMBOL_TYPE (sym0), SYMBOL_TYPE (sym1)); - default: - return 0; + default: + return 0; } } @@ -3387,14 +3268,12 @@ lesseq_defined_than (sym0, sym1) defn_blocks as needed. Do not include SYM if it is a duplicate. */ static void -add_defn_to_vec (sym, block) - struct symbol* sym; - struct block* block; +add_defn_to_vec (struct symbol *sym, struct block *block) { int i; size_t tmp; - if (SYMBOL_TYPE (sym) != NULL) + if (SYMBOL_TYPE (sym) != NULL) CHECK_TYPEDEF (SYMBOL_TYPE (sym)); for (i = 0; i < ndefns; i += 1) { @@ -3409,8 +3288,8 @@ add_defn_to_vec (sym, block) } tmp = defn_vector_size; - GROW_VECT (defn_symbols, tmp, ndefns+2); - GROW_VECT (defn_blocks, defn_vector_size, ndefns+2); + GROW_VECT (defn_symbols, tmp, ndefns + 2); + GROW_VECT (defn_blocks, defn_vector_size, ndefns + 2); defn_symbols[ndefns] = sym; defn_blocks[ndefns] = block; @@ -3422,12 +3301,8 @@ add_defn_to_vec (sym, block) wild-card match if WILD. */ static struct partial_symbol * -ada_lookup_partial_symbol (pst, name, global, namespace, wild) - struct partial_symtab *pst; - const char *name; - int global; - namespace_enum namespace; - int wild; +ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, + int global, namespace_enum namespace, int wild) { struct partial_symbol **start; int name_len = strlen (name); @@ -3438,16 +3313,16 @@ ada_lookup_partial_symbol (pst, name, global, namespace, wild) { return (NULL); } - + start = (global ? pst->objfile->global_psymbols.list + pst->globals_offset : - pst->objfile->static_psymbols.list + pst->statics_offset ); + pst->objfile->static_psymbols.list + pst->statics_offset); if (wild) { for (i = 0; i < length; i += 1) { - struct partial_symbol* psym = start[i]; + struct partial_symbol *psym = start[i]; if (SYMBOL_NAMESPACE (psym) == namespace && wild_match (name, name_len, SYMBOL_NAME (psym))) @@ -3455,22 +3330,23 @@ ada_lookup_partial_symbol (pst, name, global, namespace, wild) } return NULL; } - else + else { if (global) { int U; - i = 0; U = length-1; - while (U - i > 4) + i = 0; + U = length - 1; + while (U - i > 4) { - int M = (U+i) >> 1; - struct partial_symbol* psym = start[M]; + int M = (U + i) >> 1; + struct partial_symbol *psym = start[M]; if (SYMBOL_NAME (psym)[0] < name[0]) - i = M+1; + i = M + 1; else if (SYMBOL_NAME (psym)[0] > name[0]) - U = M-1; + U = M - 1; else if (strcmp (SYMBOL_NAME (psym), name) < 0) - i = M+1; + i = M + 1; else U = M; } @@ -3485,14 +3361,14 @@ ada_lookup_partial_symbol (pst, name, global, namespace, wild) if (SYMBOL_NAMESPACE (psym) == namespace) { int cmp = strncmp (name, SYMBOL_NAME (psym), name_len); - - if (cmp < 0) + + if (cmp < 0) { if (global) break; } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (psym) + name_len)) + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (psym) + name_len)) return psym; } i += 1; @@ -3501,17 +3377,18 @@ ada_lookup_partial_symbol (pst, name, global, namespace, wild) if (global) { int U; - i = 0; U = length-1; - while (U - i > 4) + i = 0; + U = length - 1; + while (U - i > 4) { - int M = (U+i) >> 1; + int M = (U + i) >> 1; struct partial_symbol *psym = start[M]; if (SYMBOL_NAME (psym)[0] < '_') - i = M+1; + i = M + 1; else if (SYMBOL_NAME (psym)[0] > '_') - U = M-1; + U = M - 1; else if (strcmp (SYMBOL_NAME (psym), "_ada_") < 0) - i = M+1; + i = M + 1; else U = M; } @@ -3521,115 +3398,111 @@ ada_lookup_partial_symbol (pst, name, global, namespace, wild) while (i < length) { - struct partial_symbol* psym = start[i]; + struct partial_symbol *psym = start[i]; if (SYMBOL_NAMESPACE (psym) == namespace) { int cmp; cmp = (int) '_' - (int) SYMBOL_NAME (psym)[0]; - if (cmp == 0) + if (cmp == 0) { cmp = strncmp ("_ada_", SYMBOL_NAME (psym), 5); if (cmp == 0) cmp = strncmp (name, SYMBOL_NAME (psym) + 5, name_len); } - - if (cmp < 0) + + if (cmp < 0) { if (global) break; } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (psym) + name_len + 5)) + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (psym) + name_len + 5)) return psym; } i += 1; } - + } return NULL; } /* Find a symbol table containing symbol SYM or NULL if none. */ -static struct symtab* -symtab_for_sym (sym) - struct symbol* sym; +static struct symtab * +symtab_for_sym (struct symbol *sym) { - struct symtab* s; + struct symtab *s; struct objfile *objfile; struct block *b; + struct symbol *tmp_sym; int i, j; ALL_SYMTABS (objfile, s) - { - switch (SYMBOL_CLASS (sym)) - { - case LOC_CONST: - case LOC_STATIC: - case LOC_TYPEDEF: - case LOC_REGISTER: - case LOC_LABEL: - case LOC_BLOCK: - case LOC_CONST_BYTES: - b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK); - for (i = 0; i < BLOCK_NSYMS (b); i += 1) - if (sym == BLOCK_SYM (b, i)) - return s; - b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); - for (i = 0; i < BLOCK_NSYMS (b); i += 1) - if (sym == BLOCK_SYM (b, i)) + { + switch (SYMBOL_CLASS (sym)) + { + case LOC_CONST: + case LOC_STATIC: + case LOC_TYPEDEF: + case LOC_REGISTER: + case LOC_LABEL: + case LOC_BLOCK: + case LOC_CONST_BYTES: + b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK); + ALL_BLOCK_SYMBOLS (b, i, tmp_sym) if (sym == tmp_sym) + return s; + b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); + ALL_BLOCK_SYMBOLS (b, i, tmp_sym) if (sym == tmp_sym) + return s; + break; + default: + break; + } + switch (SYMBOL_CLASS (sym)) + { + case LOC_REGISTER: + case LOC_ARG: + case LOC_REF_ARG: + case LOC_REGPARM: + case LOC_REGPARM_ADDR: + case LOC_LOCAL: + case LOC_TYPEDEF: + case LOC_LOCAL_ARG: + case LOC_BASEREG: + case LOC_BASEREG_ARG: + for (j = FIRST_LOCAL_BLOCK; + j < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s)); j += 1) + { + b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), j); + ALL_BLOCK_SYMBOLS (b, i, tmp_sym) if (sym == tmp_sym) return s; - break; - default: - break; - } - switch (SYMBOL_CLASS (sym)) - { - case LOC_REGISTER: - case LOC_ARG: - case LOC_REF_ARG: - case LOC_REGPARM: - case LOC_REGPARM_ADDR: - case LOC_LOCAL: - case LOC_TYPEDEF: - case LOC_LOCAL_ARG: - case LOC_BASEREG: - case LOC_BASEREG_ARG: - for (j = FIRST_LOCAL_BLOCK; - j < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s)); j += 1) - { - b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), j); - for (i = 0; i < BLOCK_NSYMS (b); i += 1) - if (sym == BLOCK_SYM (b, i)) - return s; - } - break; - default: - break; - } - } + } + break; + default: + break; + } + } return NULL; } /* Return a minimal symbol matching NAME according to Ada demangling rules. Returns NULL if there is no such minimal symbol. */ -struct minimal_symbol* -ada_lookup_minimal_symbol (name) - const char* name; +struct minimal_symbol * +ada_lookup_minimal_symbol (const char *name) { - struct objfile* objfile; - struct minimal_symbol* msymbol; + struct objfile *objfile; + struct minimal_symbol *msymbol; int wild_match = (strstr (name, "__") == NULL); ALL_MSYMBOLS (objfile, msymbol) - { - if (ada_match_name (SYMBOL_NAME (msymbol), name, wild_match) - && MSYMBOL_TYPE (msymbol) != mst_solib_trampoline) - return msymbol; - } + { + if (ada_match_name (SYMBOL_NAME (msymbol), name, wild_match) + && MSYMBOL_TYPE (msymbol) != mst_solib_trampoline) + return msymbol; + } return NULL; } @@ -3644,18 +3517,16 @@ ada_lookup_minimal_symbol (name) * frame as a static link, and then searches up the call stack for a * frame with that same local-variable base. */ static void -add_symbols_from_enclosing_procs (name, namespace, wild_match) - const char* name; - namespace_enum namespace; - int wild_match; +add_symbols_from_enclosing_procs (const char *name, namespace_enum namespace, + int wild_match) { #ifdef i386 static struct symbol static_link_sym; static struct symbol *static_link; - struct cleanup* old_chain = make_cleanup (null_cleanup, NULL); - struct frame_info* frame; - struct frame_info* target_frame; + struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); + struct frame_info *frame; + struct frame_info *target_frame; if (static_link == NULL) { @@ -3667,15 +3538,15 @@ add_symbols_from_enclosing_procs (name, namespace, wild_match) SYMBOL_CLASS (static_link) = LOC_LOCAL; SYMBOL_NAMESPACE (static_link) = VAR_NAMESPACE; SYMBOL_TYPE (static_link) = lookup_pointer_type (builtin_type_void); - SYMBOL_VALUE (static_link) = - - (long) TYPE_LENGTH (SYMBOL_TYPE (static_link)); + SYMBOL_VALUE (static_link) = + -(long) TYPE_LENGTH (SYMBOL_TYPE (static_link)); } frame = selected_frame; while (frame != NULL && ndefns == 0) { - struct block* block; - struct value* target_link_val = read_var_value (static_link, frame); + struct block *block; + struct value *target_link_val = read_var_value (static_link, frame); CORE_ADDR target_link; if (target_link_val == NULL) @@ -3683,10 +3554,12 @@ add_symbols_from_enclosing_procs (name, namespace, wild_match) QUIT; target_link = target_link_val; - do { + do + { QUIT; frame = get_prev_frame (frame); - } while (frame != NULL && FRAME_LOCALS_ADDRESS (frame) != target_link); + } + while (frame != NULL && FRAME_LOCALS_ADDRESS (frame) != target_link); if (frame == NULL) break; @@ -3695,7 +3568,7 @@ add_symbols_from_enclosing_procs (name, namespace, wild_match) while (block != NULL && block_function (block) != NULL && ndefns == 0) { ada_add_block_symbols (block, name, namespace, NULL, wild_match); - + block = BLOCK_SUPERBLOCK (block); } } @@ -3707,10 +3580,9 @@ add_symbols_from_enclosing_procs (name, namespace, wild_match) /* True if TYPE is definitely an artificial type supplied to a symbol * for which no debugging information was given in the symbol file. */ static int -is_nondebugging_type (type) - struct type* type; +is_nondebugging_type (struct type *type) { - char* name = ada_type_name (type); + char *name = ada_type_name (type); return (name != NULL && STREQ (name, "<variable, no debug info>")); } @@ -3723,33 +3595,31 @@ is_nondebugging_type (type) * correspondence between SYMS[i] and BLOCKS[i]. Returns the number * of symbols in the modified list. */ static int -remove_extra_symbols (syms, blocks, nsyms) - struct symbol** syms; - struct block** blocks; - int nsyms; +remove_extra_symbols (struct symbol **syms, struct block **blocks, int nsyms) { int i, j; i = 0; while (i < nsyms) { - if (SYMBOL_NAME (syms[i]) != NULL && SYMBOL_CLASS (syms[i]) == LOC_STATIC + if (SYMBOL_NAME (syms[i]) != NULL + && SYMBOL_CLASS (syms[i]) == LOC_STATIC && is_nondebugging_type (SYMBOL_TYPE (syms[i]))) { for (j = 0; j < nsyms; j += 1) { - if (i != j + if (i != j && SYMBOL_NAME (syms[j]) != NULL && STREQ (SYMBOL_NAME (syms[i]), SYMBOL_NAME (syms[j])) && SYMBOL_CLASS (syms[i]) == SYMBOL_CLASS (syms[j]) - && SYMBOL_VALUE_ADDRESS (syms[i]) + && SYMBOL_VALUE_ADDRESS (syms[i]) == SYMBOL_VALUE_ADDRESS (syms[j])) { int k; - for (k = i+1; k < nsyms; k += 1) + for (k = i + 1; k < nsyms; k += 1) { - syms[k-1] = syms[k]; - blocks[k-1] = blocks[k]; + syms[k - 1] = syms[k]; + blocks[k - 1] = blocks[k]; } nsyms -= 1; goto NextSymbol; @@ -3775,12 +3645,9 @@ remove_extra_symbols (syms, blocks, nsyms) surrounding BLOCK0, then these alone are returned. */ int -ada_lookup_symbol_list (name, block0, namespace, syms, blocks) - const char *name; - struct block *block0; - namespace_enum namespace; - struct symbol*** syms; - struct block*** blocks; +ada_lookup_symbol_list (const char *name, struct block *block0, + namespace_enum namespace, struct symbol ***syms, + struct block ***blocks) { struct symbol *sym; struct symtab *s; @@ -3818,117 +3685,117 @@ ada_lookup_symbol_list (name, block0, namespace, syms, blocks) if (ndefns > 0) goto done; - + cacheIfUnique = 1; /* Now add symbols from all global blocks: symbol tables, minimal symbol tables, and psymtab's */ ALL_SYMTABS (objfile, s) - { - QUIT; - if (! s->primary) - continue; - bv = BLOCKVECTOR (s); - block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - ada_add_block_symbols (block, name, namespace, objfile, wild_match); - } + { + QUIT; + if (!s->primary) + continue; + bv = BLOCKVECTOR (s); + block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + ada_add_block_symbols (block, name, namespace, objfile, wild_match); + } if (namespace == VAR_NAMESPACE) { ALL_MSYMBOLS (objfile, msymbol) - { - if (ada_match_name (SYMBOL_NAME (msymbol), name, wild_match)) - { - switch (MSYMBOL_TYPE (msymbol)) - { - case mst_solib_trampoline: - break; - default: - s = find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)); - if (s != NULL) - { - int old_ndefns = ndefns; - QUIT; - bv = BLOCKVECTOR (s); - block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - ada_add_block_symbols (block, - SYMBOL_NAME (msymbol), - namespace, objfile, wild_match); - if (ndefns == old_ndefns) - { - block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - ada_add_block_symbols (block, - SYMBOL_NAME (msymbol), - namespace, objfile, - wild_match); - } - } - } - } - } + { + if (ada_match_name (SYMBOL_NAME (msymbol), name, wild_match)) + { + switch (MSYMBOL_TYPE (msymbol)) + { + case mst_solib_trampoline: + break; + default: + s = find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)); + if (s != NULL) + { + int old_ndefns = ndefns; + QUIT; + bv = BLOCKVECTOR (s); + block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + ada_add_block_symbols (block, + SYMBOL_NAME (msymbol), + namespace, objfile, wild_match); + if (ndefns == old_ndefns) + { + block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + ada_add_block_symbols (block, + SYMBOL_NAME (msymbol), + namespace, objfile, + wild_match); + } + } + } + } + } } - + ALL_PSYMTABS (objfile, ps) - { - QUIT; - if (!ps->readin - && ada_lookup_partial_symbol (ps, name, 1, namespace, wild_match)) - { - s = PSYMTAB_TO_SYMTAB (ps); - if (! s->primary) - continue; - bv = BLOCKVECTOR (s); - block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - ada_add_block_symbols (block, name, namespace, objfile, wild_match); - } - } - + { + QUIT; + if (!ps->readin + && ada_lookup_partial_symbol (ps, name, 1, namespace, wild_match)) + { + s = PSYMTAB_TO_SYMTAB (ps); + if (!s->primary) + continue; + bv = BLOCKVECTOR (s); + block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + ada_add_block_symbols (block, name, namespace, objfile, wild_match); + } + } + /* Now add symbols from all per-file blocks if we've gotten no hits. (Not strictly correct, but perhaps better than an error). Do the symtabs first, then check the psymtabs */ - + if (ndefns == 0) { ALL_SYMTABS (objfile, s) - { - QUIT; - if (! s->primary) - continue; - bv = BLOCKVECTOR (s); - block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - ada_add_block_symbols (block, name, namespace, objfile, wild_match); - } - + { + QUIT; + if (!s->primary) + continue; + bv = BLOCKVECTOR (s); + block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + ada_add_block_symbols (block, name, namespace, objfile, wild_match); + } + ALL_PSYMTABS (objfile, ps) - { - QUIT; - if (!ps->readin - && ada_lookup_partial_symbol (ps, name, 0, namespace, wild_match)) - { - s = PSYMTAB_TO_SYMTAB(ps); - bv = BLOCKVECTOR (s); - if (! s->primary) - continue; - block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - ada_add_block_symbols (block, name, namespace, - objfile, wild_match); - } - } - } + { + QUIT; + if (!ps->readin + && ada_lookup_partial_symbol (ps, name, 0, namespace, wild_match)) + { + s = PSYMTAB_TO_SYMTAB (ps); + bv = BLOCKVECTOR (s); + if (!s->primary) + continue; + block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + ada_add_block_symbols (block, name, namespace, + objfile, wild_match); + } + } + } /* Finally, we try to find NAME as a local symbol in some lexically enclosing block. We do this last, expecting this case to be rare. */ - if (ndefns == 0) + if (ndefns == 0) { add_symbols_from_enclosing_procs (name, namespace, wild_match); if (ndefns > 0) goto done; } - done: +done: ndefns = remove_extra_symbols (defn_symbols, defn_blocks, ndefns); @@ -3946,14 +3813,12 @@ ada_lookup_symbol_list (name, block0, namespace, syms, blocks) * Otherwise, the result is as for ada_lookup_symbol_list, but is * disambiguated by user query if needed. */ -struct symbol* -ada_lookup_symbol (name, block0, namespace) - const char *name; - struct block *block0; - namespace_enum namespace; +struct symbol * +ada_lookup_symbol (const char *name, struct block *block0, + namespace_enum namespace) { - struct symbol** candidate_syms; - struct block** candidate_blocks; + struct symbol **candidate_syms; + struct block **candidate_blocks; int n_candidates; n_candidates = ada_lookup_symbol_list (name, @@ -3977,29 +3842,28 @@ ada_lookup_symbol (name, block0, namespace) * */ static int -is_name_suffix (str) - const char* str; +is_name_suffix (const char *str) { int k; if (str[0] == 'X') { str += 1; - while (str[0] != '_' && str[0] != '\0') + while (str[0] != '_' && str[0] != '\0') { if (str[0] != 'n' && str[0] != 'b') return 0; str += 1; - } + } } if (str[0] == '\000') return 1; - if (str[0] == '_') + if (str[0] == '_') { if (str[1] != '_' || str[2] == '\000') return 0; - if (str[2] == '_') + if (str[2] == '_') { - if (STREQ (str+3, "LJM")) + if (STREQ (str + 3, "LJM")) return 1; if (str[3] != 'X') return 0; @@ -4024,48 +3888,49 @@ is_name_suffix (str) } return 0; } - + /* True if NAME represents a name of the form A1.A2....An, n>=1 and * PATN[0..PATN_LEN-1] = Ak.Ak+1.....An for some k >= 1. Ignores * informational suffixes of NAME (i.e., for which is_name_suffix is - * true). */ + * true). */ static int -wild_match (patn, patn_len, name) - const char* patn; - int patn_len; - const char* name; +wild_match (const char *patn, int patn_len, const char *name) { int name_len; int s, e; name_len = strlen (name); - if (name_len >= patn_len+5 && STREQN (name, "_ada_", 5) - && STREQN (patn, name+5, patn_len) - && is_name_suffix (name+patn_len+5)) + if (name_len >= patn_len + 5 && STREQN (name, "_ada_", 5) + && STREQN (patn, name + 5, patn_len) + && is_name_suffix (name + patn_len + 5)) return 1; - while (name_len >= patn_len) + while (name_len >= patn_len) { - if (STREQN (patn, name, patn_len) - && is_name_suffix (name+patn_len)) + if (STREQN (patn, name, patn_len) && is_name_suffix (name + patn_len)) return 1; - do { - name += 1; name_len -= 1; - } while (name_len > 0 - && name[0] != '.' && (name[0] != '_' || name[1] != '_')); + do + { + name += 1; + name_len -= 1; + } + while (name_len > 0 + && name[0] != '.' && (name[0] != '_' || name[1] != '_')); if (name_len <= 0) return 0; if (name[0] == '_') { - if (! islower (name[2])) + if (!islower (name[2])) return 0; - name += 2; name_len -= 2; + name += 2; + name_len -= 2; } else { - if (! islower (name[1])) + if (!islower (name[1])) return 0; - name += 1; name_len -= 1; + name += 1; + name_len -= 1; } } @@ -4079,13 +3944,10 @@ wild_match (patn, patn_len, name) currently stored in *defn_symbols). If WILD, treat as NAME with a wildcard prefix. OBJFILE is the section containing BLOCK. */ -static void -ada_add_block_symbols (block, name, namespace, objfile, wild) - struct block* block; - const char* name; - namespace_enum namespace; - struct objfile* objfile; - int wild; +static void +ada_add_block_symbols (struct block *block, const char *name, + namespace_enum namespace, struct objfile *objfile, + int wild) { int i; int name_len = strlen (name); @@ -4094,54 +3956,56 @@ ada_add_block_symbols (block, name, namespace, objfile, wild) /* Set true when we find a matching non-argument symbol */ int found_sym; int is_sorted = BLOCK_SHOULD_SORT (block); + struct symbol *sym; - arg_sym = NULL; found_sym = 0; + arg_sym = NULL; + found_sym = 0; if (wild) { - for (i = 0; i < BLOCK_NSYMS (block); i += 1) - { - struct symbol *sym = BLOCK_SYM (block, i); - - if (SYMBOL_NAMESPACE (sym) == namespace && - wild_match (name, name_len, SYMBOL_NAME (sym))) - { - switch (SYMBOL_CLASS (sym)) - { - case LOC_ARG: - case LOC_LOCAL_ARG: - case LOC_REF_ARG: - case LOC_REGPARM: - case LOC_REGPARM_ADDR: - case LOC_BASEREG_ARG: - arg_sym = sym; - break; - case LOC_UNRESOLVED: - continue; - default: - found_sym = 1; - fill_in_ada_prototype (sym); - add_defn_to_vec (fixup_symbol_section (sym, objfile), block); - break; - } - } - } + struct symbol *sym; + ALL_BLOCK_SYMBOLS (block, i, sym) + { + if (SYMBOL_NAMESPACE (sym) == namespace && + wild_match (name, name_len, SYMBOL_NAME (sym))) + { + switch (SYMBOL_CLASS (sym)) + { + case LOC_ARG: + case LOC_LOCAL_ARG: + case LOC_REF_ARG: + case LOC_REGPARM: + case LOC_REGPARM_ADDR: + case LOC_BASEREG_ARG: + arg_sym = sym; + break; + case LOC_UNRESOLVED: + continue; + default: + found_sym = 1; + fill_in_ada_prototype (sym); + add_defn_to_vec (fixup_symbol_section (sym, objfile), block); + break; + } + } + } } - else + else { if (is_sorted) { int U; - i = 0; U = BLOCK_NSYMS (block)-1; - while (U - i > 4) + i = 0; + U = BLOCK_NSYMS (block) - 1; + while (U - i > 4) { - int M = (U+i) >> 1; + int M = (U + i) >> 1; struct symbol *sym = BLOCK_SYM (block, M); if (SYMBOL_NAME (sym)[0] < name[0]) - i = M+1; + i = M + 1; else if (SYMBOL_NAME (sym)[0] > name[0]) - U = M-1; + U = M - 1; else if (strcmp (SYMBOL_NAME (sym), name) < 0) - i = M+1; + i = M + 1; else U = M; } @@ -4149,69 +4013,73 @@ ada_add_block_symbols (block, name, namespace, objfile, wild) else i = 0; - for (; i < BLOCK_NSYMS (block); i += 1) - { - struct symbol *sym = BLOCK_SYM (block, i); + for (; i < BLOCK_BUCKETS (block); i += 1) + for (sym = BLOCK_BUCKET (block, i); sym != NULL; sym = sym->hash_next) + { + if (SYMBOL_NAMESPACE (sym) == namespace) + { + int cmp = strncmp (name, SYMBOL_NAME (sym), name_len); - if (SYMBOL_NAMESPACE (sym) == namespace) - { - int cmp = strncmp (name, SYMBOL_NAME (sym), name_len); - - if (cmp < 0) - { - if (is_sorted) - break; - } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (sym) + name_len)) - { - switch (SYMBOL_CLASS (sym)) - { - case LOC_ARG: - case LOC_LOCAL_ARG: - case LOC_REF_ARG: - case LOC_REGPARM: - case LOC_REGPARM_ADDR: - case LOC_BASEREG_ARG: - arg_sym = sym; - break; - case LOC_UNRESOLVED: - break; - default: - found_sym = 1; - fill_in_ada_prototype (sym); - add_defn_to_vec (fixup_symbol_section (sym, objfile), - block); - break; - } - } - } - } + if (cmp < 0) + { + if (is_sorted) + { + i = BLOCK_BUCKETS (block); + break; + } + } + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (sym) + name_len)) + { + switch (SYMBOL_CLASS (sym)) + { + case LOC_ARG: + case LOC_LOCAL_ARG: + case LOC_REF_ARG: + case LOC_REGPARM: + case LOC_REGPARM_ADDR: + case LOC_BASEREG_ARG: + arg_sym = sym; + break; + case LOC_UNRESOLVED: + break; + default: + found_sym = 1; + fill_in_ada_prototype (sym); + add_defn_to_vec (fixup_symbol_section (sym, objfile), + block); + break; + } + } + } + } } - if (! found_sym && arg_sym != NULL) + if (!found_sym && arg_sym != NULL) { fill_in_ada_prototype (arg_sym); add_defn_to_vec (fixup_symbol_section (arg_sym, objfile), block); } - if (! wild) + if (!wild) { - arg_sym = NULL; found_sym = 0; + arg_sym = NULL; + found_sym = 0; if (is_sorted) { int U; - i = 0; U = BLOCK_NSYMS (block)-1; - while (U - i > 4) + i = 0; + U = BLOCK_NSYMS (block) - 1; + while (U - i > 4) { - int M = (U+i) >> 1; + int M = (U + i) >> 1; struct symbol *sym = BLOCK_SYM (block, M); if (SYMBOL_NAME (sym)[0] < '_') - i = M+1; + i = M + 1; else if (SYMBOL_NAME (sym)[0] > '_') - U = M-1; + U = M - 1; else if (strcmp (SYMBOL_NAME (sym), "_ada_") < 0) - i = M+1; + i = M + 1; else U = M; } @@ -4219,79 +4087,83 @@ ada_add_block_symbols (block, name, namespace, objfile, wild) else i = 0; - for (; i < BLOCK_NSYMS (block); i += 1) - { - struct symbol *sym = BLOCK_SYM (block, i); + for (; i < BLOCK_BUCKETS (block); i += 1) + for (sym = BLOCK_BUCKET (block, i); sym != NULL; sym = sym->hash_next) + { + struct symbol *sym = BLOCK_SYM (block, i); - if (SYMBOL_NAMESPACE (sym) == namespace) - { - int cmp; + if (SYMBOL_NAMESPACE (sym) == namespace) + { + int cmp; + + cmp = (int) '_' - (int) SYMBOL_NAME (sym)[0]; + if (cmp == 0) + { + cmp = strncmp ("_ada_", SYMBOL_NAME (sym), 5); + if (cmp == 0) + cmp = strncmp (name, SYMBOL_NAME (sym) + 5, name_len); + } + + if (cmp < 0) + { + if (is_sorted) + { + i = BLOCK_BUCKETS (block); + break; + } + } + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (sym) + name_len + 5)) + { + switch (SYMBOL_CLASS (sym)) + { + case LOC_ARG: + case LOC_LOCAL_ARG: + case LOC_REF_ARG: + case LOC_REGPARM: + case LOC_REGPARM_ADDR: + case LOC_BASEREG_ARG: + arg_sym = sym; + break; + case LOC_UNRESOLVED: + break; + default: + found_sym = 1; + fill_in_ada_prototype (sym); + add_defn_to_vec (fixup_symbol_section (sym, objfile), + block); + break; + } + } + } + } - cmp = (int) '_' - (int) SYMBOL_NAME (sym)[0]; - if (cmp == 0) - { - cmp = strncmp ("_ada_", SYMBOL_NAME (sym), 5); - if (cmp == 0) - cmp = strncmp (name, SYMBOL_NAME (sym) + 5, name_len); - } - - if (cmp < 0) - { - if (is_sorted) - break; - } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (sym) + name_len + 5)) - { - switch (SYMBOL_CLASS (sym)) - { - case LOC_ARG: - case LOC_LOCAL_ARG: - case LOC_REF_ARG: - case LOC_REGPARM: - case LOC_REGPARM_ADDR: - case LOC_BASEREG_ARG: - arg_sym = sym; - break; - case LOC_UNRESOLVED: - break; - default: - found_sym = 1; - fill_in_ada_prototype (sym); - add_defn_to_vec (fixup_symbol_section (sym, objfile), - block); - break; - } - } - } - } - /* NOTE: This really shouldn't be needed for _ada_ symbols. - They aren't parameters, right? */ - if (! found_sym && arg_sym != NULL) + They aren't parameters, right? */ + if (!found_sym && arg_sym != NULL) { fill_in_ada_prototype (arg_sym); add_defn_to_vec (fixup_symbol_section (arg_sym, objfile), block); } } } - + /* Function Types */ /* Assuming that SYM is the symbol for a function, fill in its type with prototype information, if it is not already there. */ static void -fill_in_ada_prototype (func) - struct symbol* func; +fill_in_ada_prototype (struct symbol *func) { - struct block* b; + struct block *b; int nargs, nsyms; int i; - struct type* ftype; - struct type* rtype; + struct type *ftype; + struct type *rtype; size_t max_fields; + struct symbol *sym; if (func == NULL || TYPE_CODE (SYMBOL_TYPE (func)) != TYPE_CODE_FUNC @@ -4308,47 +4180,44 @@ fill_in_ada_prototype (func) SYMBOL_TYPE (func) = ftype; b = SYMBOL_BLOCK_VALUE (func); - nsyms = BLOCK_NSYMS (b); nargs = 0; - max_fields = 8; - TYPE_FIELDS (ftype) = - (struct field*) xmalloc (sizeof (struct field) * max_fields); - for (i = 0; i < nsyms; i += 1) - { - struct symbol *sym = BLOCK_SYM (b, i); + max_fields = 8; + TYPE_FIELDS (ftype) = + (struct field *) xmalloc (sizeof (struct field) * max_fields); + ALL_BLOCK_SYMBOLS (b, i, sym) + { + GROW_VECT (TYPE_FIELDS (ftype), max_fields, nargs + 1); - GROW_VECT (TYPE_FIELDS (ftype), max_fields, nargs+1); - - switch (SYMBOL_CLASS (sym)) - { - case LOC_REF_ARG: - case LOC_REGPARM_ADDR: - TYPE_FIELD_BITPOS (ftype, nargs) = nargs; - TYPE_FIELD_BITSIZE (ftype, nargs) = 0; - TYPE_FIELD_TYPE (ftype, nargs) = - lookup_pointer_type (check_typedef (SYMBOL_TYPE (sym))); - TYPE_FIELD_NAME (ftype, nargs) = SYMBOL_NAME (sym); - nargs += 1; - - break; + switch (SYMBOL_CLASS (sym)) + { + case LOC_REF_ARG: + case LOC_REGPARM_ADDR: + TYPE_FIELD_BITPOS (ftype, nargs) = nargs; + TYPE_FIELD_BITSIZE (ftype, nargs) = 0; + TYPE_FIELD_TYPE (ftype, nargs) = + lookup_pointer_type (check_typedef (SYMBOL_TYPE (sym))); + TYPE_FIELD_NAME (ftype, nargs) = SYMBOL_NAME (sym); + nargs += 1; - case LOC_ARG: - case LOC_REGPARM: - case LOC_LOCAL_ARG: - case LOC_BASEREG_ARG: - TYPE_FIELD_BITPOS (ftype, nargs) = nargs; - TYPE_FIELD_BITSIZE (ftype, nargs) = 0; - TYPE_FIELD_TYPE (ftype, nargs) = check_typedef (SYMBOL_TYPE (sym)); - TYPE_FIELD_NAME (ftype, nargs) = SYMBOL_NAME (sym); - nargs += 1; - - break; + break; - default: - break; - } - } + case LOC_ARG: + case LOC_REGPARM: + case LOC_LOCAL_ARG: + case LOC_BASEREG_ARG: + TYPE_FIELD_BITPOS (ftype, nargs) = nargs; + TYPE_FIELD_BITSIZE (ftype, nargs) = 0; + TYPE_FIELD_TYPE (ftype, nargs) = check_typedef (SYMBOL_TYPE (sym)); + TYPE_FIELD_NAME (ftype, nargs) = SYMBOL_NAME (sym); + nargs += 1; + + break; + + default: + break; + } + } /* Re-allocate fields vector; if there are no fields, make the */ /* fields pointer non-null anyway, to mark that this function type */ @@ -4357,38 +4226,37 @@ fill_in_ada_prototype (func) TYPE_NFIELDS (ftype) = nargs; if (nargs == 0) { - static struct field dummy_field = {0, 0, 0, 0}; - free (TYPE_FIELDS (ftype)); + static struct field dummy_field = { 0, 0, 0, 0 }; + xfree (TYPE_FIELDS (ftype)); TYPE_FIELDS (ftype) = &dummy_field; } else { - struct field* fields = - (struct field*) TYPE_ALLOC (ftype, nargs * sizeof (struct field)); - memcpy ((char*) fields, - (char*) TYPE_FIELDS (ftype), - nargs * sizeof (struct field)); - free (TYPE_FIELDS (ftype)); + struct field *fields = + (struct field *) TYPE_ALLOC (ftype, nargs * sizeof (struct field)); + memcpy ((char *) fields, + (char *) TYPE_FIELDS (ftype), nargs * sizeof (struct field)); + xfree (TYPE_FIELDS (ftype)); TYPE_FIELDS (ftype) = fields; } } - + /* Breakpoint-related */ -char no_symtab_msg[] = "No symbol table is loaded. Use the \"file\" command."; +char no_symtab_msg[] = + "No symbol table is loaded. Use the \"file\" command."; /* Assuming that LINE is pointing at the beginning of an argument to 'break', return a pointer to the delimiter for the initial segment of that name. This is the first ':', ' ', or end of LINE. */ -char* -ada_start_decode_line_1 (line) - char* line; +char * +ada_start_decode_line_1 (char *line) { /* [NOTE: strpbrk would be more elegant, but I am reluctant to be the first to use such a library function in GDB code.] */ - char* p; + char *p; for (p = line; *p != '\000' && *p != ' ' && *p != ':'; p += 1) ; return p; @@ -4438,23 +4306,20 @@ ada_start_decode_line_1 (line) is the caller's responsibility to free them. */ struct symtabs_and_lines -ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) - char** spec; - struct symtab* file_table; - int funfirstline; - char*** canonical; -{ - struct symbol** symbols; - struct block** blocks; - struct block* block; +ada_finish_decode_line_1 (char **spec, struct symtab *file_table, + int funfirstline, char ***canonical) +{ + struct symbol **symbols; + struct block **blocks; + struct block *block; int n_matches, i, line_num; struct symtabs_and_lines selected; - struct cleanup* old_chain = make_cleanup (null_cleanup, NULL); - char* name; + struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); + char *name; int len; - char* lower_name; - char* unquoted_name; + char *lower_name; + char *unquoted_name; if (file_table == NULL) block = get_selected_block (NULL); @@ -4462,15 +4327,15 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (file_table), STATIC_BLOCK); if (canonical != NULL) - *canonical = (char**) NULL; + *canonical = (char **) NULL; name = *spec; - if (**spec == '*') + if (**spec == '*') *spec += 1; else { - while (**spec != '\000' && - ! strchr (ada_completer_word_break_characters, **spec)) + while (**spec != '\000' && + !strchr (ada_completer_word_break_characters, **spec)) *spec += 1; } len = *spec - name; @@ -4479,11 +4344,11 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) if (file_table != NULL && (*spec)[0] == ':' && isdigit ((*spec)[1])) { line_num = strtol (*spec + 1, spec, 10); - while (**spec == ' ' || **spec == '\t') + while (**spec == ' ' || **spec == '\t') *spec += 1; } - if (name[0] == '*') + if (name[0] == '*') { if (line_num == -1) error ("Wild-card function with no line number or file name."); @@ -4499,28 +4364,28 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) if (name[0] == '<') { - unquoted_name = (char*) alloca (len-1); - memcpy (unquoted_name, name+1, len-2); - unquoted_name[len-2] = '\000'; + unquoted_name = (char *) alloca (len - 1); + memcpy (unquoted_name, name + 1, len - 2); + unquoted_name[len - 2] = '\000'; lower_name = NULL; } else { - unquoted_name = (char*) alloca (len+1); + unquoted_name = (char *) alloca (len + 1); memcpy (unquoted_name, name, len); unquoted_name[len] = '\000'; - lower_name = (char*) alloca (len + 1); + lower_name = (char *) alloca (len + 1); for (i = 0; i < len; i += 1) lower_name[i] = tolower (name[i]); lower_name[len] = '\000'; } n_matches = 0; - if (lower_name != NULL) - n_matches = ada_lookup_symbol_list (ada_mangle (lower_name), block, + if (lower_name != NULL) + n_matches = ada_lookup_symbol_list (ada_mangle (lower_name), block, VAR_NAMESPACE, &symbols, &blocks); if (n_matches == 0) - n_matches = ada_lookup_symbol_list (unquoted_name, block, + n_matches = ada_lookup_symbol_list (unquoted_name, block, VAR_NAMESPACE, &symbols, &blocks); if (n_matches == 0 && line_num >= 0) error ("No line number information found for %s.", unquoted_name); @@ -4530,22 +4395,22 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) /* FIXME: See comment in symtab.c::decode_line_1 */ #undef volatile volatile struct symtab_and_line val; -#define volatile /*nothing*/ +#define volatile /*nothing */ #else struct symtab_and_line val; #endif - struct minimal_symbol* msymbol; + struct minimal_symbol *msymbol; INIT_SAL (&val); msymbol = NULL; - if (lower_name != NULL) + if (lower_name != NULL) msymbol = ada_lookup_minimal_symbol (ada_mangle (lower_name)); if (msymbol == NULL) msymbol = ada_lookup_minimal_symbol (unquoted_name); if (msymbol != NULL) { - val.pc = SYMBOL_VALUE_ADDRESS (msymbol); + val.pc = SYMBOL_VALUE_ADDRESS (msymbol); val.section = SYMBOL_BFD_SECTION (msymbol); if (funfirstline) { @@ -4557,38 +4422,39 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) selected.sals[0] = val; selected.nelts = 1; return selected; - } - + } + if (!have_full_symbols () && !have_partial_symbols () && !have_minimal_symbols ()) error (no_symtab_msg); error ("Function \"%s\" not defined.", unquoted_name); - return selected; /* for lint */ + return selected; /* for lint */ } if (line_num >= 0) { - return - find_sal_from_funcs_and_line (file_table->filename, line_num, + return + find_sal_from_funcs_and_line (file_table->filename, line_num, symbols, n_matches); } else { - selected.nelts = user_select_syms (symbols, blocks, n_matches, n_matches); + selected.nelts = + user_select_syms (symbols, blocks, n_matches, n_matches); } - selected.sals = (struct symtab_and_line*) + selected.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line) * selected.nelts); memset (selected.sals, 0, selected.nelts * sizeof (selected.sals[i])); - make_cleanup (free, selected.sals); + make_cleanup (xfree, selected.sals); i = 0; while (i < selected.nelts) { - if (SYMBOL_CLASS (symbols[i]) == LOC_BLOCK) + if (SYMBOL_CLASS (symbols[i]) == LOC_BLOCK) selected.sals[i] = find_function_start_sal (symbols[i], funfirstline); - else if (SYMBOL_LINE (symbols[i]) != 0) + else if (SYMBOL_LINE (symbols[i]) != 0) { selected.sals[i].symtab = symtab_for_sym (symbols[i]); selected.sals[i].line = SYMBOL_LINE (symbols[i]); @@ -4596,90 +4462,89 @@ ada_finish_decode_line_1 (spec, file_table, funfirstline, canonical) else if (line_num >= 0) { /* Ignore this choice */ - symbols[i] = symbols[selected.nelts-1]; - blocks[i] = blocks[selected.nelts-1]; + symbols[i] = symbols[selected.nelts - 1]; + blocks[i] = blocks[selected.nelts - 1]; selected.nelts -= 1; continue; } - else + else error ("Line number not known for symbol \"%s\"", unquoted_name); i += 1; } if (canonical != NULL && (line_num >= 0 || n_matches > 1)) { - *canonical = (char**) xmalloc (sizeof(char*) * selected.nelts); + *canonical = (char **) xmalloc (sizeof (char *) * selected.nelts); for (i = 0; i < selected.nelts; i += 1) - (*canonical)[i] = - extended_canonical_line_spec (selected.sals[i], + (*canonical)[i] = + extended_canonical_line_spec (selected.sals[i], SYMBOL_SOURCE_NAME (symbols[i])); } - + discard_cleanups (old_chain); return selected; -} - +} + /* The (single) sal corresponding to line LINE_NUM in a symbol table with file name FILENAME that occurs in one of the functions listed - in SYMBOLS[0 .. NSYMS-1]. */ + in SYMBOLS[0 .. NSYMS-1]. */ static struct symtabs_and_lines -find_sal_from_funcs_and_line (filename, line_num, symbols, nsyms) - const char* filename; - int line_num; - struct symbol** symbols; - int nsyms; +find_sal_from_funcs_and_line (const char *filename, int line_num, + struct symbol **symbols, int nsyms) { struct symtabs_and_lines sals; int best_index, best; - struct linetable* best_linetable; - struct objfile* objfile; - struct symtab* s; - struct symtab* best_symtab; + struct linetable *best_linetable; + struct objfile *objfile; + struct symtab *s; + struct symtab *best_symtab; read_all_symtabs (filename); - best_index = 0; best_linetable = NULL; best_symtab = NULL; + best_index = 0; + best_linetable = NULL; + best_symtab = NULL; best = 0; ALL_SYMTABS (objfile, s) - { - struct linetable *l; - int ind, exact; + { + struct linetable *l; + int ind, exact; - QUIT; + QUIT; - if (!STREQ (filename, s->filename)) - continue; - l = LINETABLE (s); - ind = find_line_in_linetable (l, line_num, symbols, nsyms, &exact); - if (ind >= 0) - { - if (exact) - { - best_index = ind; - best_linetable = l; - best_symtab = s; - goto done; - } - if (best == 0 || l->item[ind].line < best) - { - best = l->item[ind].line; - best_index = ind; - best_linetable = l; - best_symtab = s; - } - } - } + if (!STREQ (filename, s->filename)) + continue; + l = LINETABLE (s); + ind = find_line_in_linetable (l, line_num, symbols, nsyms, &exact); + if (ind >= 0) + { + if (exact) + { + best_index = ind; + best_linetable = l; + best_symtab = s; + goto done; + } + if (best == 0 || l->item[ind].line < best) + { + best = l->item[ind].line; + best_index = ind; + best_linetable = l; + best_symtab = s; + } + } + } if (best == 0) error ("Line number not found in designated function."); - done: - +done: + sals.nelts = 1; - sals.sals = (struct symtab_and_line*) xmalloc (sizeof (sals.sals[0])); + sals.sals = (struct symtab_and_line *) xmalloc (sizeof (sals.sals[0])); INIT_SAL (&sals.sals[0]); - + sals.sals[0].line = best_linetable->item[best_index].line; sals.sals[0].pc = best_linetable->item[best_index].pc; sals.sals[0].symtab = best_symtab; @@ -4691,12 +4556,8 @@ find_sal_from_funcs_and_line (filename, line_num, symbols, nsyms) pc falls within one of the functions denoted by SYMBOLS[0..NSYMS-1]. Set *EXACTP to the 1 if the match is exact, and 0 otherwise. */ static int -find_line_in_linetable (linetable, line_num, symbols, nsyms, exactp) - struct linetable* linetable; - int line_num; - struct symbol** symbols; - int nsyms; - int* exactp; +find_line_in_linetable (struct linetable *linetable, int line_num, + struct symbol **symbols, int nsyms, int *exactp) { int i, len, best_index, best; @@ -4707,7 +4568,7 @@ find_line_in_linetable (linetable, line_num, symbols, nsyms, exactp) for (i = 0, best_index = -1, best = 0; i < len; i += 1) { int k; - struct linetable_entry* item = &(linetable->item[i]); + struct linetable_entry *item = &(linetable->item[i]); for (k = 0; k < nsyms; k += 1) { @@ -4741,9 +4602,7 @@ find_line_in_linetable (linetable, line_num, symbols, nsyms, exactp) LINETABLE, and k falls strictly within a named function that begins at or before LINE_NUM. Return -1 if there is no such k. */ static int -nearest_line_number_in_linetable (linetable, line_num) - struct linetable* linetable; - int line_num; +nearest_line_number_in_linetable (struct linetable *linetable, int line_num) { int i, len, best; @@ -4751,15 +4610,16 @@ nearest_line_number_in_linetable (linetable, line_num) return -1; len = linetable->nitems; - i = 0; best = INT_MAX; + i = 0; + best = INT_MAX; while (i < len) { int k; - struct linetable_entry* item = &(linetable->item[i]); + struct linetable_entry *item = &(linetable->item[i]); if (item->line >= line_num && item->line < best) { - char* func_name; + char *func_name; CORE_ADDR start, end; func_name = NULL; @@ -4769,9 +4629,9 @@ nearest_line_number_in_linetable (linetable, line_num) { if (item->line == line_num) return line_num; - else + else { - struct symbol* sym = + struct symbol *sym = standard_lookup (func_name, VAR_NAMESPACE); if (is_plausible_func_for_line (sym, line_num)) best = item->line; @@ -4802,11 +4662,8 @@ nearest_line_number_in_linetable (linetable, line_num) IND == -1 corresponds to no function. */ static int -find_next_line_in_linetable (linetable, line_num, starting_line, ind) - struct linetable* linetable; - int line_num; - int starting_line; - int ind; +find_next_line_in_linetable (struct linetable *linetable, int line_num, + int starting_line, int ind) { int i, len; @@ -4814,12 +4671,12 @@ find_next_line_in_linetable (linetable, line_num, starting_line, ind) return -1; len = linetable->nitems; - if (ind >= 0) + if (ind >= 0) { CORE_ADDR start, end; if (find_pc_partial_function (linetable->item[ind].pc, - (char**) NULL, &start, &end)) + (char **) NULL, &start, &end)) { while (ind < len && linetable->item[ind].pc < end) ind += 1; @@ -4834,11 +4691,11 @@ find_next_line_in_linetable (linetable, line_num, starting_line, ind) while (i < len) { int k; - struct linetable_entry* item = &(linetable->item[i]); + struct linetable_entry *item = &(linetable->item[i]); if (item->line >= line_num) { - char* func_name; + char *func_name; CORE_ADDR start, end; func_name = NULL; @@ -4848,13 +4705,13 @@ find_next_line_in_linetable (linetable, line_num, starting_line, ind) { if (item->line == line_num) { - struct symbol* sym = + struct symbol *sym = standard_lookup (func_name, VAR_NAMESPACE); if (is_plausible_func_for_line (sym, starting_line)) return i; else { - while ((i+1) < len && linetable->item[i+1].pc < end) + while ((i + 1) < len && linetable->item[i + 1].pc < end) i += 1; } } @@ -4869,9 +4726,7 @@ find_next_line_in_linetable (linetable, line_num, starting_line, ind) /* True iff function symbol SYM starts somewhere at or before line # LINE_NUM. */ static int -is_plausible_func_for_line (sym, line_num) - struct symbol* sym; - int line_num; +is_plausible_func_for_line (struct symbol *sym, int line_num) { struct symtab_and_line start_sal; @@ -4884,12 +4739,11 @@ is_plausible_func_for_line (sym, line_num) } static void -debug_print_lines (lt) - struct linetable* lt; +debug_print_lines (struct linetable *lt) { int i; - if (lt == NULL) + if (lt == NULL) return; fprintf (stderr, "\t"); @@ -4899,155 +4753,152 @@ debug_print_lines (lt) } static void -debug_print_block (b) - struct block* b; +debug_print_block (struct block *b) { int i; - fprintf (stderr, "Block: %p; [0x%lx, 0x%lx]", - b, BLOCK_START(b), BLOCK_END(b)); - if (BLOCK_FUNCTION(b) != NULL) - fprintf (stderr, " Function: %s", SYMBOL_NAME (BLOCK_FUNCTION(b))); + struct symbol *i; + + fprintf (stderr, "Block: %p; [0x%lx, 0x%lx]", + b, BLOCK_START (b), BLOCK_END (b)); + if (BLOCK_FUNCTION (b) != NULL) + fprintf (stderr, " Function: %s", SYMBOL_NAME (BLOCK_FUNCTION (b))); fprintf (stderr, "\n"); - fprintf (stderr, "\t Superblock: %p\n", BLOCK_SUPERBLOCK(b)); + fprintf (stderr, "\t Superblock: %p\n", BLOCK_SUPERBLOCK (b)); fprintf (stderr, "\t Symbols:"); - for (i = 0; i < BLOCK_NSYMS (b); i += 1) - { - if (i > 0 && i % 4 == 0) - fprintf (stderr, "\n\t\t "); - fprintf (stderr, " %s", SYMBOL_NAME (BLOCK_SYM (b, i))); - } + ALL_BLOCK_SYMBOLS (b, i, sym) + { + if (i > 0 && i % 4 == 0) + fprintf (stderr, "\n\t\t "); + fprintf (stderr, " %s", SYMBOL_NAME (sym)); + } fprintf (stderr, "\n"); } static void -debug_print_blocks (bv) - struct blockvector* bv; +debug_print_blocks (struct blockvector *bv) { int i; if (bv == NULL) return; - for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); i += 1) { - fprintf (stderr, "%6d. ", i); - debug_print_block (BLOCKVECTOR_BLOCK (bv, i)); - } + for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); i += 1) + { + fprintf (stderr, "%6d. ", i); + debug_print_block (BLOCKVECTOR_BLOCK (bv, i)); + } } static void -debug_print_symtab (s) - struct symtab* s; +debug_print_symtab (struct symtab *s) { fprintf (stderr, "Symtab %p\n File: %s; Dir: %s\n", s, s->filename, s->dirname); fprintf (stderr, " Blockvector: %p, Primary: %d\n", - BLOCKVECTOR(s), s->primary); - debug_print_blocks (BLOCKVECTOR(s)); + BLOCKVECTOR (s), s->primary); + debug_print_blocks (BLOCKVECTOR (s)); fprintf (stderr, " Line table: %p\n", LINETABLE (s)); - debug_print_lines (LINETABLE(s)); + debug_print_lines (LINETABLE (s)); } /* Read in all symbol tables corresponding to partial symbol tables with file name FILENAME. */ static void -read_all_symtabs (filename) - const char* filename; +read_all_symtabs (const char *filename) { - struct partial_symtab* ps; - struct objfile* objfile; + struct partial_symtab *ps; + struct objfile *objfile; ALL_PSYMTABS (objfile, ps) - { - QUIT; + { + QUIT; - if (STREQ (filename, ps->filename)) - PSYMTAB_TO_SYMTAB (ps); - } + if (STREQ (filename, ps->filename)) + PSYMTAB_TO_SYMTAB (ps); + } } /* All sals corresponding to line LINE_NUM in a symbol table from file FILENAME, as filtered by the user. If CANONICAL is not null, set it to a corresponding array of canonical line specs. */ static struct symtabs_and_lines -all_sals_for_line (filename, line_num, canonical) - const char* filename; - int line_num; - char*** canonical; +all_sals_for_line (const char *filename, int line_num, char ***canonical) { struct symtabs_and_lines result; - struct objfile* objfile; - struct symtab* s; - struct cleanup* old_chain = make_cleanup (null_cleanup, NULL); + struct objfile *objfile; + struct symtab *s; + struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); size_t len; read_all_symtabs (filename); - result.sals = (struct symtab_and_line*) xmalloc (4 * sizeof (result.sals[0])); + result.sals = + (struct symtab_and_line *) xmalloc (4 * sizeof (result.sals[0])); result.nelts = 0; len = 4; make_cleanup (free_current_contents, &result.sals); - ALL_SYMTABS (objfile, s) - { - int ind, target_line_num; + ALL_SYMTABS (objfile, s) + { + int ind, target_line_num; - QUIT; + QUIT; - if (!STREQ (s->filename, filename)) - continue; + if (!STREQ (s->filename, filename)) + continue; - target_line_num = - nearest_line_number_in_linetable (LINETABLE (s), line_num); - if (target_line_num == -1) - continue; + target_line_num = + nearest_line_number_in_linetable (LINETABLE (s), line_num); + if (target_line_num == -1) + continue; - ind = -1; - while (1) - { - ind = - find_next_line_in_linetable (LINETABLE (s), - target_line_num, line_num, ind); - - if (ind < 0) - break; + ind = -1; + while (1) + { + ind = + find_next_line_in_linetable (LINETABLE (s), + target_line_num, line_num, ind); - GROW_VECT (result.sals, len, result.nelts+1); - INIT_SAL (&result.sals[result.nelts]); - result.sals[result.nelts].line = LINETABLE(s)->item[ind].line; - result.sals[result.nelts].pc = LINETABLE(s)->item[ind].pc; - result.sals[result.nelts].symtab = s; - result.nelts += 1; - } - } + if (ind < 0) + break; + + GROW_VECT (result.sals, len, result.nelts + 1); + INIT_SAL (&result.sals[result.nelts]); + result.sals[result.nelts].line = LINETABLE (s)->item[ind].line; + result.sals[result.nelts].pc = LINETABLE (s)->item[ind].pc; + result.sals[result.nelts].symtab = s; + result.nelts += 1; + } + } if (canonical != NULL || result.nelts > 1) { int k; - char** func_names = (char**) alloca (result.nelts * sizeof (char*)); + char **func_names = (char **) alloca (result.nelts * sizeof (char *)); int first_choice = (result.nelts > 1) ? 2 : 1; int n; - int* choices = (int*) alloca (result.nelts * sizeof (int)); - - for (k = 0; k < result.nelts; k += 1) + int *choices = (int *) alloca (result.nelts * sizeof (int)); + + for (k = 0; k < result.nelts; k += 1) { - find_pc_partial_function (result.sals[k].pc, &func_names[k], - (CORE_ADDR*) NULL, (CORE_ADDR*) NULL); + find_pc_partial_function (result.sals[k].pc, &func_names[k], + (CORE_ADDR *) NULL, (CORE_ADDR *) NULL); if (func_names[k] == NULL) error ("Could not find function for one or more breakpoints."); } - - if (result.nelts > 1) + + if (result.nelts > 1) { - printf_unfiltered("[0] cancel\n"); - if (result.nelts > 1) - printf_unfiltered("[1] all\n"); + printf_unfiltered ("[0] cancel\n"); + if (result.nelts > 1) + printf_unfiltered ("[1] all\n"); for (k = 0; k < result.nelts; k += 1) - printf_unfiltered ("[%d] %s\n", k + first_choice, + printf_unfiltered ("[%d] %s\n", k + first_choice, ada_demangle (func_names[k])); - + n = get_selections (choices, result.nelts, result.nelts, result.nelts > 1, "instance-choice"); - - for (k = 0; k < n; k += 1) + + for (k = 0; k < n; k += 1) { result.sals[k] = result.sals[choices[k]]; func_names[k] = func_names[choices[k]]; @@ -5055,17 +4906,17 @@ all_sals_for_line (filename, line_num, canonical) result.nelts = n; } - if (canonical != NULL) + if (canonical != NULL) { - *canonical = (char**) xmalloc (result.nelts * sizeof (char**)); - make_cleanup (free, *canonical); - for (k = 0; k < result.nelts; k += 1) + *canonical = (char **) xmalloc (result.nelts * sizeof (char **)); + make_cleanup (xfree, *canonical); + for (k = 0; k < result.nelts; k += 1) { - (*canonical)[k] = + (*canonical)[k] = extended_canonical_line_spec (result.sals[k], func_names[k]); if ((*canonical)[k] == NULL) error ("Could not locate one or more breakpoints."); - make_cleanup (free, (*canonical)[k]); + make_cleanup (xfree, (*canonical)[k]); } } } @@ -5080,19 +4931,16 @@ all_sals_for_line (filename, line_num, canonical) information. The caller is responsible for releasing any space allocated. */ -static char* -extended_canonical_line_spec (sal, name) - struct symtab_and_line sal; - const char* name; +static char * +extended_canonical_line_spec (struct symtab_and_line sal, const char *name) { - char* r; + char *r; - if (sal.symtab == NULL || sal.symtab->filename == NULL || - sal.line <= 0) + if (sal.symtab == NULL || sal.symtab->filename == NULL || sal.line <= 0) return NULL; - r = (char*) xmalloc (strlen (name) + strlen (sal.symtab->filename) - + sizeof(sal.line)*3 + 3); + r = (char *) xmalloc (strlen (name) + strlen (sal.symtab->filename) + + sizeof (sal.line) * 3 + 3); sprintf (r, "%s:'%s':%d", sal.symtab->filename, name, sal.line); return r; } @@ -5102,118 +4950,112 @@ int begin_bnum = -1; #endif int begin_annotate_level = 0; -static void -begin_cleanup (void* dummy) +static void +begin_cleanup (void *dummy) { begin_annotate_level = 0; } static void -begin_command (args, from_tty) - char *args; - int from_tty; +begin_command (char *args, int from_tty) { struct minimal_symbol *msym; CORE_ADDR main_program_name_addr; char main_program_name[1024]; - struct cleanup* old_chain = make_cleanup (begin_cleanup, NULL); + struct cleanup *old_chain = make_cleanup (begin_cleanup, NULL); begin_annotate_level = 2; /* Check that there is a program to debug */ if (!have_full_symbols () && !have_partial_symbols ()) error ("No symbol table is loaded. Use the \"file\" command."); - + /* Check that we are debugging an Ada program */ /* if (ada_update_initial_language (language_unknown, NULL) != language_ada) - error ("Cannot find the Ada initialization procedure. Is this an Ada main program?"); - */ + error ("Cannot find the Ada initialization procedure. Is this an Ada main program?"); + */ /* FIXME: language_ada should be defined in defs.h */ /* Get the address of the name of the main procedure */ msym = lookup_minimal_symbol (ADA_MAIN_PROGRAM_SYMBOL_NAME, NULL, NULL); if (msym != NULL) - { - main_program_name_addr = SYMBOL_VALUE_ADDRESS (msym); - if (main_program_name_addr == 0) - error ("Invalid address for Ada main program name."); + { + main_program_name_addr = SYMBOL_VALUE_ADDRESS (msym); + if (main_program_name_addr == 0) + error ("Invalid address for Ada main program name."); - /* Read the name of the main procedure */ - extract_string (main_program_name_addr, main_program_name); + /* Read the name of the main procedure */ + extract_string (main_program_name_addr, main_program_name); - /* Put a temporary breakpoint in the Ada main program and run */ - do_command ("tbreak ", main_program_name, 0); - do_command ("run ", args, 0); - } + /* Put a temporary breakpoint in the Ada main program and run */ + do_command ("tbreak ", main_program_name, 0); + do_command ("run ", args, 0); + } else - { - /* If we could not find the symbol containing the name of the - main program, that means that the compiler that was used to build - was not recent enough. In that case, we fallback to the previous - mechanism, which is a little bit less reliable, but has proved to work - in most cases. The only cases where it will fail is when the user - has set some breakpoints which will be hit before the end of the - begin command processing (eg in the initialization code). - - The begining of the main Ada subprogram is located by breaking - on the adainit procedure. Since we know that the binder generates - the call to this procedure exactly 2 calls before the call to the - Ada main subprogram, it is then easy to put a breakpoint on this - Ada main subprogram once we hit adainit. - */ - do_command ("tbreak adainit", 0); - do_command ("run ", args, 0); - do_command ("up", 0); - do_command ("tbreak +2", 0); - do_command ("continue", 0); - do_command ("step", 0); - } + { + /* If we could not find the symbol containing the name of the + main program, that means that the compiler that was used to build + was not recent enough. In that case, we fallback to the previous + mechanism, which is a little bit less reliable, but has proved to work + in most cases. The only cases where it will fail is when the user + has set some breakpoints which will be hit before the end of the + begin command processing (eg in the initialization code). + + The begining of the main Ada subprogram is located by breaking + on the adainit procedure. Since we know that the binder generates + the call to this procedure exactly 2 calls before the call to the + Ada main subprogram, it is then easy to put a breakpoint on this + Ada main subprogram once we hit adainit. + */ + do_command ("tbreak adainit", 0); + do_command ("run ", args, 0); + do_command ("up", 0); + do_command ("tbreak +2", 0); + do_command ("continue", 0); + do_command ("step", 0); + } do_cleanups (old_chain); } int -is_ada_runtime_file (filename) - char *filename; +is_ada_runtime_file (char *filename) { return (STREQN (filename, "s-", 2) || STREQN (filename, "a-", 2) || - STREQN (filename, "g-", 2) || - STREQN (filename, "i-", 2)); + STREQN (filename, "g-", 2) || STREQN (filename, "i-", 2)); } /* find the first frame that contains debugging information and that is not part of the Ada run-time, starting from fi and moving upward. */ int -find_printable_frame (fi, level) - struct frame_info *fi; - int level; +find_printable_frame (struct frame_info *fi, int level) { struct symtab_and_line sal; - + for (; fi != NULL; level += 1, fi = get_prev_frame (fi)) { /* If fi is not the innermost frame, that normally means that fi->pc - points to *after* the call instruction, and we want to get the line - containing the call, never the next line. But if the next frame is - a signal_handler_caller or a dummy frame, then the next frame was - not entered as the result of a call, and we want to get the line - containing fi->pc. */ + points to *after* the call instruction, and we want to get the line + containing the call, never the next line. But if the next frame is + a signal_handler_caller or a dummy frame, then the next frame was + not entered as the result of a call, and we want to get the line + containing fi->pc. */ sal = - find_pc_line (fi->pc, + find_pc_line (fi->pc, fi->next != NULL && !fi->next->signal_handler_caller && !frame_in_dummy (fi->next)); if (sal.symtab && !is_ada_runtime_file (sal.symtab->filename)) { #if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET) - /* libpthread.so contains some debugging information that prevents us - from finding the right frame */ + /* libpthread.so contains some debugging information that prevents us + from finding the right frame */ if (sal.symtab->objfile && STREQ (sal.symtab->objfile->name, "/usr/shlib/libpthread.so")) - continue; + continue; #endif selected_frame = fi; break; @@ -5224,64 +5066,62 @@ find_printable_frame (fi, level) } void -ada_report_exception_break (b) - struct breakpoint *b; +ada_report_exception_break (struct breakpoint *b) { #ifdef UI_OUT /* FIXME: break_on_exception should be defined in breakpoint.h */ /* if (b->break_on_exception == 1) - { - /* Assume that cond has 16 elements, the 15th - being the exception */ /* - if (b->cond && b->cond->nelts == 16) - { - ui_out_text (uiout, "on "); - ui_out_field_string (uiout, "exception", - SYMBOL_NAME (b->cond->elts[14].symbol)); - } - else - ui_out_text (uiout, "on all exceptions"); - } - else if (b->break_on_exception == 2) - ui_out_text (uiout, "on unhandled exception"); - else if (b->break_on_exception == 3) - ui_out_text (uiout, "on assert failure"); -#else - if (b->break_on_exception == 1) - {*/ - /* Assume that cond has 16 elements, the 15th - being the exception */ /* - if (b->cond && b->cond->nelts == 16) - { - fputs_filtered ("on ", gdb_stdout); - fputs_filtered (SYMBOL_NAME - (b->cond->elts[14].symbol), gdb_stdout); - } - else - fputs_filtered ("on all exceptions", gdb_stdout); - } - else if (b->break_on_exception == 2) - fputs_filtered ("on unhandled exception", gdb_stdout); - else if (b->break_on_exception == 3) - fputs_filtered ("on assert failure", gdb_stdout); -*/ + { + /* Assume that cond has 16 elements, the 15th + being the exception *//* + if (b->cond && b->cond->nelts == 16) + { + ui_out_text (uiout, "on "); + ui_out_field_string (uiout, "exception", + SYMBOL_NAME (b->cond->elts[14].symbol)); + } + else + ui_out_text (uiout, "on all exceptions"); + } + else if (b->break_on_exception == 2) + ui_out_text (uiout, "on unhandled exception"); + else if (b->break_on_exception == 3) + ui_out_text (uiout, "on assert failure"); + #else + if (b->break_on_exception == 1) + { */ + /* Assume that cond has 16 elements, the 15th + being the exception *//* + if (b->cond && b->cond->nelts == 16) + { + fputs_filtered ("on ", gdb_stdout); + fputs_filtered (SYMBOL_NAME + (b->cond->elts[14].symbol), gdb_stdout); + } + else + fputs_filtered ("on all exceptions", gdb_stdout); + } + else if (b->break_on_exception == 2) + fputs_filtered ("on unhandled exception", gdb_stdout); + else if (b->break_on_exception == 3) + fputs_filtered ("on assert failure", gdb_stdout); + */ #endif } int -ada_is_exception_sym (struct symbol* sym) +ada_is_exception_sym (struct symbol *sym) { char *type_name = type_name_no_tag (SYMBOL_TYPE (sym)); - + return (SYMBOL_CLASS (sym) != LOC_TYPEDEF && SYMBOL_CLASS (sym) != LOC_BLOCK && SYMBOL_CLASS (sym) != LOC_CONST - && type_name != NULL - && STREQ (type_name, "exception")); + && type_name != NULL && STREQ (type_name, "exception")); } int -ada_maybe_exception_partial_symbol (struct partial_symbol* sym) +ada_maybe_exception_partial_symbol (struct partial_symbol *sym) { return (SYMBOL_CLASS (sym) != LOC_TYPEDEF && SYMBOL_CLASS (sym) != LOC_BLOCK @@ -5292,94 +5132,92 @@ ada_maybe_exception_partial_symbol (struct partial_symbol* sym) into equivalent form. Return resulting argument string. Set *BREAK_ON_EXCEPTIONP to 1 for ordinary break on exception, 2 for break on unhandled, 3 for assert, 0 otherwise. */ -char* ada_breakpoint_rewrite (char* arg, int* break_on_exceptionp) +char * +ada_breakpoint_rewrite (char *arg, int *break_on_exceptionp) { if (arg == NULL) return arg; *break_on_exceptionp = 0; - /* FIXME: language_ada should be defined in defs.h */ + /* FIXME: language_ada should be defined in defs.h */ /* if (current_language->la_language == language_ada - && STREQN (arg, "exception", 9) && - (arg[9] == ' ' || arg[9] == '\t' || arg[9] == '\0')) - { - char *tok, *end_tok; - int toklen; - - *break_on_exceptionp = 1; - - tok = arg+9; - while (*tok == ' ' || *tok == '\t') - tok += 1; - - end_tok = tok; - - while (*end_tok != ' ' && *end_tok != '\t' && *end_tok != '\000') - end_tok += 1; - - toklen = end_tok - tok; - - arg = (char*) xmalloc (sizeof ("__gnat_raise_nodefer_with_msg if " - "long_integer(e) = long_integer(&)") - + toklen + 1); - make_cleanup (free, arg); - if (toklen == 0) - strcpy (arg, "__gnat_raise_nodefer_with_msg"); - else if (STREQN (tok, "unhandled", toklen)) - { - *break_on_exceptionp = 2; - strcpy (arg, "__gnat_unhandled_exception"); - } - else - { - sprintf (arg, "__gnat_raise_nodefer_with_msg if " - "long_integer(e) = long_integer(&%.*s)", - toklen, tok); - } - } - else if (current_language->la_language == language_ada - && STREQN (arg, "assert", 6) && - (arg[6] == ' ' || arg[6] == '\t' || arg[6] == '\0')) - { - char *tok = arg + 6; - - *break_on_exceptionp = 3; - - arg = (char*) - xmalloc (sizeof ("system__assertions__raise_assert_failure") - + strlen (tok) + 1); - make_cleanup (free, arg); - sprintf (arg, "system__assertions__raise_assert_failure%s", tok); - } - */ + && STREQN (arg, "exception", 9) && + (arg[9] == ' ' || arg[9] == '\t' || arg[9] == '\0')) + { + char *tok, *end_tok; + int toklen; + + *break_on_exceptionp = 1; + + tok = arg+9; + while (*tok == ' ' || *tok == '\t') + tok += 1; + + end_tok = tok; + + while (*end_tok != ' ' && *end_tok != '\t' && *end_tok != '\000') + end_tok += 1; + + toklen = end_tok - tok; + + arg = (char*) xmalloc (sizeof ("__gnat_raise_nodefer_with_msg if " + "long_integer(e) = long_integer(&)") + + toklen + 1); + make_cleanup (xfree, arg); + if (toklen == 0) + strcpy (arg, "__gnat_raise_nodefer_with_msg"); + else if (STREQN (tok, "unhandled", toklen)) + { + *break_on_exceptionp = 2; + strcpy (arg, "__gnat_unhandled_exception"); + } + else + { + sprintf (arg, "__gnat_raise_nodefer_with_msg if " + "long_integer(e) = long_integer(&%.*s)", + toklen, tok); + } + } + else if (current_language->la_language == language_ada + && STREQN (arg, "assert", 6) && + (arg[6] == ' ' || arg[6] == '\t' || arg[6] == '\0')) + { + char *tok = arg + 6; + + *break_on_exceptionp = 3; + + arg = (char*) + xmalloc (sizeof ("system__assertions__raise_assert_failure") + + strlen (tok) + 1); + make_cleanup (xfree, arg); + sprintf (arg, "system__assertions__raise_assert_failure%s", tok); + } + */ return arg; } - + /* Field Access */ /* True if field number FIELD_NUM in struct or union type TYPE is supposed to be invisible to users. */ int -ada_is_ignored_field (type, field_num) - struct type *type; - int field_num; +ada_is_ignored_field (struct type *type, int field_num) { if (field_num < 0 || field_num > TYPE_NFIELDS (type)) return 1; - else + else { - const char* name = TYPE_FIELD_NAME (type, field_num); + const char *name = TYPE_FIELD_NAME (type, field_num); return (name == NULL - || (name[0] == '_' && ! STREQN (name, "_parent", 7))); + || (name[0] == '_' && !STREQN (name, "_parent", 7))); } } /* True iff structure type TYPE has a tag field. */ int -ada_is_tagged_type (type) - struct type *type; +ada_is_tagged_type (struct type *type) { if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT) return 0; @@ -5389,27 +5227,24 @@ ada_is_tagged_type (type) /* The type of the tag on VAL. */ -struct type* -ada_tag_type (val) - struct value* val; +struct type * +ada_tag_type (struct value *val) { return ada_lookup_struct_elt_type (VALUE_TYPE (val), "_tag", 0, NULL); } /* The value of the tag on VAL. */ -struct value* -ada_value_tag (val) - struct value* val; +struct value * +ada_value_tag (struct value *val) { return ada_value_struct_elt (val, "_tag", "record"); } /* The parent type of TYPE, or NULL if none. */ -struct type* -ada_parent_type (type) - struct type *type; +struct type * +ada_parent_type (struct type *type) { int i; @@ -5430,12 +5265,10 @@ ada_parent_type (type) a structure type with at least FIELD_NUM+1 fields. */ int -ada_is_parent_field (type, field_num) - struct type *type; - int field_num; +ada_is_parent_field (struct type *type, int field_num) { - const char* name = TYPE_FIELD_NAME (check_typedef (type), field_num); - return (name != NULL && + const char *name = TYPE_FIELD_NAME (check_typedef (type), field_num); + return (name != NULL && (STREQN (name, "PARENT", 6) || STREQN (name, "_parent", 7))); } @@ -5446,44 +5279,38 @@ ada_is_parent_field (type, field_num) structures. */ int -ada_is_wrapper_field (type, field_num) - struct type *type; - int field_num; +ada_is_wrapper_field (struct type *type, int field_num) { - const char* name = TYPE_FIELD_NAME (type, field_num); - return (name != NULL - && (STREQN (name, "PARENT", 6) || STREQ (name, "REP") + const char *name = TYPE_FIELD_NAME (type, field_num); + return (name != NULL + && (STREQN (name, "PARENT", 6) || STREQ (name, "REP") || STREQN (name, "_parent", 7) || name[0] == 'S' || name[0] == 'R' || name[0] == 'O')); } /* True iff field number FIELD_NUM of structure or union type TYPE is a variant wrapper. Assumes TYPE is a structure type with at least - FIELD_NUM+1 fields. */ + FIELD_NUM+1 fields. */ int -ada_is_variant_part (type, field_num) - struct type *type; - int field_num; +ada_is_variant_part (struct type *type, int field_num) { - struct type* field_type = TYPE_FIELD_TYPE (type, field_num); + struct type *field_type = TYPE_FIELD_TYPE (type, field_num); return (TYPE_CODE (field_type) == TYPE_CODE_UNION || (is_dynamic_field (type, field_num) - && TYPE_CODE (TYPE_TARGET_TYPE (field_type)) == TYPE_CODE_UNION)); + && TYPE_CODE (TYPE_TARGET_TYPE (field_type)) == + TYPE_CODE_UNION)); } /* Assuming that VAR_TYPE is a variant wrapper (type of the variant part) whose discriminants are contained in the record type OUTER_TYPE, returns the type of the controlling discriminant for the variant. */ -struct type* -ada_variant_discrim_type (var_type, outer_type) - struct type *var_type; - struct type *outer_type; +struct type * +ada_variant_discrim_type (struct type *var_type, struct type *outer_type) { - char* name = ada_variant_discrim_name (var_type); - struct type *type = - ada_lookup_struct_elt_type (outer_type, name, 1, NULL); + char *name = ada_variant_discrim_name (var_type); + struct type *type = ada_lookup_struct_elt_type (outer_type, name, 1, NULL); if (type == NULL) return builtin_type_int; else @@ -5495,11 +5322,9 @@ ada_variant_discrim_type (var_type, outer_type) represents a 'when others' clause; otherwise 0. */ int -ada_is_others_clause (type, field_num) - struct type *type; - int field_num; +ada_is_others_clause (struct type *type, int field_num) { - const char* name = TYPE_FIELD_NAME (type, field_num); + const char *name = TYPE_FIELD_NAME (type, field_num); return (name != NULL && name[0] == 'O'); } @@ -5507,16 +5332,15 @@ ada_is_others_clause (type, field_num) returns the name of the discriminant controlling the variant. The value is valid until the next call to ada_variant_discrim_name. */ -char * -ada_variant_discrim_name (type0) - struct type *type0; +char * +ada_variant_discrim_name (struct type *type0) { - static char* result = NULL; + static char *result = NULL; static size_t result_len = 0; - struct type* type; - const char* name; - const char* discrim_end; - const char* discrim_start; + struct type *type; + const char *name; + const char *discrim_end; + const char *discrim_start; if (TYPE_CODE (type0) == TYPE_CODE_PTR) type = TYPE_TARGET_TYPE (type0); @@ -5537,19 +5361,19 @@ ada_variant_discrim_name (type0) if (discrim_end == name) return ""; - for (discrim_start = discrim_end; discrim_start != name+3; + for (discrim_start = discrim_end; discrim_start != name + 3; discrim_start -= 1) { - if (discrim_start == name+1) + if (discrim_start == name + 1) return ""; - if ((discrim_start > name+3 && STREQN (discrim_start-3, "___", 3)) + if ((discrim_start > name + 3 && STREQN (discrim_start - 3, "___", 3)) || discrim_start[-1] == '.') break; } GROW_VECT (result, result_len, discrim_end - discrim_start + 1); strncpy (result, discrim_start, discrim_end - discrim_start); - result[discrim_end-discrim_start] = '\0'; + result[discrim_end - discrim_start] = '\0'; return result; } @@ -5562,15 +5386,11 @@ ada_variant_discrim_name (type0) does not occur. */ int -ada_scan_number (str, k, R, new_k) - const char str[]; - int k; - LONGEST *R; - int *new_k; +ada_scan_number (const char str[], int k, LONGEST * R, int *new_k) { ULONGEST RU; - if (! isdigit (str[k])) + if (!isdigit (str[k])) return 0; /* Do it the hard way so as not to make any assumption about @@ -5579,14 +5399,14 @@ ada_scan_number (str, k, R, new_k) RU = 0; while (isdigit (str[k])) { - RU = RU*10 + (str[k] - '0'); + RU = RU * 10 + (str[k] - '0'); k += 1; } - if (str[k] == 'm') + if (str[k] == 'm') { if (R != NULL) - *R = (- (LONGEST) (RU-1)) - 1; + *R = (-(LONGEST) (RU - 1)) - 1; k += 1; } else if (R != NULL) @@ -5607,26 +5427,23 @@ ada_scan_number (str, k, R, new_k) and FIELD_NUM is a valid field number within it, returns 1 iff VAL is in the range encoded by field FIELD_NUM of TYPE; otherwise 0. */ -int -ada_in_variant (val, type, field_num) - LONGEST val; - struct type *type; - int field_num; +int +ada_in_variant (LONGEST val, struct type *type, int field_num) { - const char* name = TYPE_FIELD_NAME (type, field_num); + const char *name = TYPE_FIELD_NAME (type, field_num); int p; p = 0; while (1) { - switch (name[p]) + switch (name[p]) { case '\0': return 0; case 'S': { LONGEST W; - if (! ada_scan_number (name, p + 1, &W, &p)) + if (!ada_scan_number (name, p + 1, &W, &p)) return 0; if (val == W) return 1; @@ -5635,9 +5452,8 @@ ada_in_variant (val, type, field_num) case 'R': { LONGEST L, U; - if (! ada_scan_number (name, p + 1, &L, &p) - || name[p] != 'T' - || ! ada_scan_number (name, p + 1, &U, &p)) + if (!ada_scan_number (name, p + 1, &L, &p) + || name[p] != 'T' || !ada_scan_number (name, p + 1, &U, &p)) return 0; if (val >= L && val <= U) return 1; @@ -5657,14 +5473,11 @@ ada_in_variant (val, type, field_num) FIELDNO says which field. Differs from value_primitive_field only in that it can handle packed values of arbitrary type. */ -struct value* -ada_value_primitive_field (arg1, offset, fieldno, arg_type) - struct value* arg1; - int offset; - int fieldno; - struct type *arg_type; +struct value * +ada_value_primitive_field (struct value *arg1, int offset, int fieldno, + struct type *arg_type) { - struct value* v; + struct value *v; struct type *type; CHECK_TYPEDEF (arg_type); @@ -5676,10 +5489,10 @@ ada_value_primitive_field (arg1, offset, fieldno, arg_type) { int bit_pos = TYPE_FIELD_BITPOS (arg_type, fieldno); int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno); - + return ada_value_primitive_packed_val (arg1, VALUE_CONTENTS (arg1), - offset + bit_pos/8, bit_pos % 8, - bit_size, type); + offset + bit_pos / 8, + bit_pos % 8, bit_size, type); } else return value_primitive_field (arg1, offset, fieldno, arg_type); @@ -5692,17 +5505,14 @@ ada_value_primitive_field (arg1, offset, fieldno, arg_type) Searches recursively through wrapper fields (e.g., '_parent'). */ -struct value* -ada_search_struct_field (name, arg, offset, type) - char *name; - struct value* arg; - int offset; - struct type *type; +struct value * +ada_search_struct_field (char *name, struct value *arg, int offset, + struct type *type) { int i; CHECK_TYPEDEF (type); - for (i = TYPE_NFIELDS (type)-1; i >= 0; i -= 1) + for (i = TYPE_NFIELDS (type) - 1; i >= 0; i -= 1) { char *t_field_name = TYPE_FIELD_NAME (type, i); @@ -5710,14 +5520,17 @@ ada_search_struct_field (name, arg, offset, type) continue; else if (field_name_match (t_field_name, name)) - return ada_value_primitive_field (arg, offset, i, type); + return ada_value_primitive_field (arg, offset, i, type); else if (ada_is_wrapper_field (type, i)) { - struct value* v = - ada_search_struct_field (name, arg, - offset + TYPE_FIELD_BITPOS (type, i) / 8, - TYPE_FIELD_TYPE (type, i)); + struct value *v = ada_search_struct_field (name, arg, + offset + + TYPE_FIELD_BITPOS (type, + i) / + 8, + TYPE_FIELD_TYPE (type, + i)); if (v != NULL) return v; } @@ -5730,11 +5543,13 @@ ada_search_struct_field (name, arg, offset, type) for (j = TYPE_NFIELDS (field_type) - 1; j >= 0; j -= 1) { - struct value* v = - ada_search_struct_field (name, arg, - var_offset - + TYPE_FIELD_BITPOS (field_type, j)/8, - TYPE_FIELD_TYPE (field_type, j)); + struct value *v = ada_search_struct_field (name, arg, + var_offset + + + TYPE_FIELD_BITPOS + (field_type, j) / 8, + TYPE_FIELD_TYPE + (field_type, j)); if (v != NULL) return v; } @@ -5742,7 +5557,7 @@ ada_search_struct_field (name, arg, offset, type) } return NULL; } - + /* Given ARG, a value of type (pointer to a)* structure/union, extract the component named NAME from the ultimate target structure/union and return it as a value with its appropriate type. @@ -5754,14 +5569,11 @@ ada_search_struct_field (name, arg, offset, type) ERR is a name (for use in error messages) that identifies the class of entity that ARG is supposed to be. */ -struct value* -ada_value_struct_elt (arg, name, err) - struct value* arg; - char *name; - char *err; +struct value * +ada_value_struct_elt (struct value *arg, char *name, char *err) { struct type *t; - struct value* v; + struct value *v; arg = ada_coerce_ref (arg); t = check_typedef (VALUE_TYPE (arg)); @@ -5774,9 +5586,9 @@ ada_value_struct_elt (arg, name, err) t = check_typedef (VALUE_TYPE (arg)); } - if ( TYPE_CODE (t) != TYPE_CODE_STRUCT - && TYPE_CODE (t) != TYPE_CODE_UNION) - error ("Attempt to extract a component of a value that is not a %s.", err); + if (TYPE_CODE (t) != TYPE_CODE_STRUCT && TYPE_CODE (t) != TYPE_CODE_UNION) + error ("Attempt to extract a component of a value that is not a %s.", + err); v = ada_search_struct_field (name, arg, 0, t); if (v == NULL) @@ -5802,11 +5614,8 @@ ada_value_struct_elt (arg, name, err) If NOERR is nonzero, return NULL if NAME is not suitably defined. */ struct type * -ada_lookup_struct_elt_type (type, name, noerr, dispp) - struct type *type; - char *name; - int noerr; - int *dispp; +ada_lookup_struct_elt_type (struct type *type, char *name, int noerr, + int *dispp) { int i; @@ -5839,13 +5648,13 @@ ada_lookup_struct_elt_type (type, name, noerr, dispp) char *t_field_name = TYPE_FIELD_NAME (type, i); struct type *t; int disp; - + if (t_field_name == NULL) continue; else if (field_name_match (t_field_name, name)) { - if (dispp != NULL) + if (dispp != NULL) *dispp += TYPE_FIELD_BITPOS (type, i) / 8; return check_typedef (TYPE_FIELD_TYPE (type, i)); } @@ -5853,7 +5662,7 @@ ada_lookup_struct_elt_type (type, name, noerr, dispp) else if (ada_is_wrapper_field (type, i)) { disp = 0; - t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (type, i), name, + t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (type, i), name, 1, &disp); if (t != NULL) { @@ -5875,7 +5684,7 @@ ada_lookup_struct_elt_type (type, name, noerr, dispp) name, 1, &disp); if (t != NULL) { - if (dispp != NULL) + if (dispp != NULL) *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8; return t; } @@ -5885,7 +5694,7 @@ ada_lookup_struct_elt_type (type, name, noerr, dispp) } BadName: - if (! noerr) + if (!noerr) { target_terminal_ours (); gdb_flush (gdb_stdout); @@ -5903,21 +5712,19 @@ BadName: OUTER_VALADDR, determine which variant clause (field number in VAR_TYPE, numbering from 0) is applicable. Returns -1 if none are. */ -int -ada_which_variant_applies (var_type, outer_type, outer_valaddr) - struct type *var_type; - struct type *outer_type; - char* outer_valaddr; +int +ada_which_variant_applies (struct type *var_type, struct type *outer_type, + char *outer_valaddr) { int others_clause; int i; int disp; - struct type* discrim_type; - char* discrim_name = ada_variant_discrim_name (var_type); + struct type *discrim_type; + char *discrim_name = ada_variant_discrim_name (var_type); LONGEST discrim_val; disp = 0; - discrim_type = + discrim_type = ada_lookup_struct_elt_type (outer_type, discrim_name, 1, &disp); if (discrim_type == NULL) return -1; @@ -5934,9 +5741,9 @@ ada_which_variant_applies (var_type, outer_type, outer_valaddr) return others_clause; } + - /* Dynamic-Sized Records */ /* Strategy: The type ostensibly attached to a value with dynamic size @@ -5976,30 +5783,29 @@ ada_which_variant_applies (var_type, outer_type, outer_valaddr) dereferencing it. Differs from value_ind in its treatment of dynamic-sized types. */ -struct value* -ada_value_ind (val0) - struct value* val0; +struct value * +ada_value_ind (struct value *val0) { - struct value* val = unwrap_value (value_ind (val0)); + struct value *val = unwrap_value (value_ind (val0)); return ada_to_fixed_value (VALUE_TYPE (val), 0, - VALUE_ADDRESS (val) + VALUE_OFFSET (val), - val); + VALUE_ADDRESS (val) + VALUE_OFFSET (val), val); } /* The value resulting from dereferencing any "reference to" * qualifiers on VAL0. */ -static struct value* -ada_coerce_ref (val0) - struct value* val0; -{ - if (TYPE_CODE (VALUE_TYPE (val0)) == TYPE_CODE_REF) { - struct value* val = val0; - COERCE_REF (val); - val = unwrap_value (val); - return ada_to_fixed_value (VALUE_TYPE (val), 0, - VALUE_ADDRESS (val) + VALUE_OFFSET (val), - val); - } else +static struct value * +ada_coerce_ref (struct value *val0) +{ + if (TYPE_CODE (VALUE_TYPE (val0)) == TYPE_CODE_REF) + { + struct value *val = val0; + COERCE_REF (val); + val = unwrap_value (val); + return ada_to_fixed_value (VALUE_TYPE (val), 0, + VALUE_ADDRESS (val) + VALUE_OFFSET (val), + val); + } + else return val0; } @@ -6007,9 +5813,7 @@ ada_coerce_ref (val0) ALIGNMENT (a power of 2). */ static unsigned int -align_value (off, alignment) - unsigned int off; - unsigned int alignment; +align_value (unsigned int off, unsigned int alignment) { return (off + alignment - 1) & ~(alignment - 1); } @@ -6018,9 +5822,7 @@ align_value (off, alignment) type TYPE. */ static unsigned int -field_offset (type, f) - struct type *type; - int f; +field_offset (struct type *type, int f) { int n = TYPE_FIELD_BITPOS (type, f); /* Kludge (temporary?) to fix problem with dwarf output. */ @@ -6034,34 +5836,31 @@ field_offset (type, f) /* Return the bit alignment required for field #F of template type TYPE. */ static unsigned int -field_alignment (type, f) - struct type *type; - int f; +field_alignment (struct type *type, int f) { - const char* name = TYPE_FIELD_NAME (type, f); + const char *name = TYPE_FIELD_NAME (type, f); int len = (name == NULL) ? 0 : strlen (name); int align_offset; - if (len < 8 || ! isdigit (name[len-1])) + if (len < 8 || !isdigit (name[len - 1])) return TARGET_CHAR_BIT; - if (isdigit (name[len-2])) + if (isdigit (name[len - 2])) align_offset = len - 2; else align_offset = len - 1; - if (align_offset < 7 || ! STREQN ("___XV", name+align_offset-6, 5)) + if (align_offset < 7 || !STREQN ("___XV", name + align_offset - 6, 5)) return TARGET_CHAR_BIT; - return atoi (name+align_offset) * TARGET_CHAR_BIT; + return atoi (name + align_offset) * TARGET_CHAR_BIT; } /* Find a type named NAME. Ignores ambiguity. */ -struct type* -ada_find_any_type (name) - const char *name; +struct type * +ada_find_any_type (const char *name) { - struct symbol* sym; + struct symbol *sym; sym = standard_lookup (name, VAR_NAMESPACE); if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF) @@ -6079,9 +5878,7 @@ ada_find_any_type (name) that of TYPE1 for purposes of type printing, return non-zero; otherwise return 0. */ int -ada_prefer_type (type0, type1) - struct type* type0; - struct type* type1; +ada_prefer_type (struct type *type0, struct type *type1) { if (type1 == NULL) return 1; @@ -6093,9 +5890,10 @@ ada_prefer_type (type0, type1) return 0; else if (ada_is_packed_array_type (type0)) return 1; - else if (ada_is_array_descriptor (type0) && ! ada_is_array_descriptor (type1)) + else if (ada_is_array_descriptor (type0) + && !ada_is_array_descriptor (type1)) return 1; - else if (ada_renaming_type (type0) != NULL + else if (ada_renaming_type (type0) != NULL && ada_renaming_type (type1) == NULL) return 1; return 0; @@ -6103,11 +5901,10 @@ ada_prefer_type (type0, type1) /* The name of TYPE, which is either its TYPE_NAME, or, if that is null, its TYPE_TAG_NAME. Null if TYPE is null. */ -char* -ada_type_name (type) - struct type* type; +char * +ada_type_name (struct type *type) { - if (type == NULL) + if (type == NULL) return NULL; else if (TYPE_NAME (type) != NULL) return TYPE_NAME (type); @@ -6118,25 +5915,23 @@ ada_type_name (type) /* Find a parallel type to TYPE whose name is formed by appending SUFFIX to the name of TYPE. */ -struct type* -ada_find_parallel_type (type, suffix) - struct type *type; - const char *suffix; +struct type * +ada_find_parallel_type (struct type *type, const char *suffix) { - static char* name; + static char *name; static size_t name_len = 0; - struct symbol** syms; - struct block** blocks; + struct symbol **syms; + struct block **blocks; int nsyms; int len; - char* typename = ada_type_name (type); - + char *typename = ada_type_name (type); + if (typename == NULL) return NULL; len = strlen (typename); - GROW_VECT (name, name_len, len+strlen (suffix)+1); + GROW_VECT (name, name_len, len + strlen (suffix) + 1); strcpy (name, typename); strcpy (name + len, suffix); @@ -6148,16 +5943,15 @@ ada_find_parallel_type (type, suffix) /* If TYPE is a variable-size record type, return the corresponding template type describing its fields. Otherwise, return NULL. */ -static struct type* -dynamic_template_type (type) - struct type* type; +static struct type * +dynamic_template_type (struct type *type) { CHECK_TYPEDEF (type); if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT - || ada_type_name (type) == NULL) + || ada_type_name (type) == NULL) return NULL; - else + else { int len = strlen (ada_type_name (type)); if (len > 6 && STREQ (ada_type_name (type) + len - 6, "___XVE")) @@ -6170,13 +5964,11 @@ dynamic_template_type (type) /* Assuming that TEMPL_TYPE is a union or struct type, returns non-zero iff field FIELD_NUM of TEMPL_TYPE has dynamic size. */ -static int -is_dynamic_field (templ_type, field_num) - struct type* templ_type; - int field_num; +static int +is_dynamic_field (struct type *templ_type, int field_num) { const char *name = TYPE_FIELD_NAME (templ_type, field_num); - return name != NULL + return name != NULL && TYPE_CODE (TYPE_FIELD_TYPE (templ_type, field_num)) == TYPE_CODE_PTR && strstr (name, "___XVL") != NULL; } @@ -6184,9 +5976,8 @@ is_dynamic_field (templ_type, field_num) /* Assuming that TYPE is a struct type, returns non-zero iff TYPE contains a variant part. */ -static int -contains_variant_part (type) - struct type* type; +static int +contains_variant_part (struct type *type) { int f; @@ -6197,11 +5988,10 @@ contains_variant_part (type) } /* A record type with no fields, . */ -static struct type* -empty_record (objfile) - struct objfile* objfile; +static struct type * +empty_record (struct objfile *objfile) { - struct type* type = alloc_type (objfile); + struct type *type = alloc_type (objfile); TYPE_CODE (type) = TYPE_CODE_STRUCT; TYPE_NFIELDS (type) = 0; TYPE_FIELDS (type) = NULL; @@ -6224,17 +6014,13 @@ empty_record (objfile) * variants occupy whole numbers of bytes. However, they need not be * byte-aligned. */ -static struct type* -template_to_fixed_record_type (type, valaddr, address, dval0) - struct type* type; - char* valaddr; - CORE_ADDR address; - struct value* dval0; - +static struct type * +template_to_fixed_record_type (struct type *type, char *valaddr, + CORE_ADDR address, struct value *dval0) { - struct value* mark = value_mark(); - struct value* dval; - struct type* rtype; + struct value *mark = value_mark (); + struct value *dval; + struct type *rtype; int nfields, bit_len; long off; int f; @@ -6244,44 +6030,44 @@ template_to_fixed_record_type (type, valaddr, address, dval0) TYPE_CODE (rtype) = TYPE_CODE_STRUCT; INIT_CPLUS_SPECIFIC (rtype); TYPE_NFIELDS (rtype) = nfields; - TYPE_FIELDS (rtype) = (struct field*) + TYPE_FIELDS (rtype) = (struct field *) TYPE_ALLOC (rtype, nfields * sizeof (struct field)); memset (TYPE_FIELDS (rtype), 0, sizeof (struct field) * nfields); TYPE_NAME (rtype) = ada_type_name (type); TYPE_TAG_NAME (rtype) = NULL; /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in - gdbtypes.h */ - /* TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE;*/ + gdbtypes.h */ + /* TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE; */ - off = 0; bit_len = 0; + off = 0; + bit_len = 0; for (f = 0; f < nfields; f += 1) { int fld_bit_len, bit_incr; - off = - align_value (off, field_alignment (type, f))+TYPE_FIELD_BITPOS (type,f); + off = + align_value (off, + field_alignment (type, f)) + TYPE_FIELD_BITPOS (type, f); /* NOTE: used to use field_offset above, but that causes * problems with really negative bit positions. So, let's * rediscover why we needed field_offset and fix it properly. */ TYPE_FIELD_BITPOS (rtype, f) = off; - TYPE_FIELD_BITSIZE (rtype, f) = 0; + TYPE_FIELD_BITSIZE (rtype, f) = 0; - if (ada_is_variant_part (type, f)) + if (ada_is_variant_part (type, f)) { struct type *branch_type; if (dval0 == NULL) - dval = - value_from_contents_and_address (rtype, valaddr, address); + dval = value_from_contents_and_address (rtype, valaddr, address); else dval = dval0; - branch_type = - to_fixed_variant_branch_type - (TYPE_FIELD_TYPE (type, f), - cond_offset_host (valaddr, off / TARGET_CHAR_BIT), - cond_offset_target (address, off / TARGET_CHAR_BIT), - dval); - if (branch_type == NULL) + branch_type = + to_fixed_variant_branch_type + (TYPE_FIELD_TYPE (type, f), + cond_offset_host (valaddr, off / TARGET_CHAR_BIT), + cond_offset_target (address, off / TARGET_CHAR_BIT), dval); + if (branch_type == NULL) TYPE_NFIELDS (rtype) -= 1; else { @@ -6295,18 +6081,16 @@ template_to_fixed_record_type (type, valaddr, address, dval0) else if (is_dynamic_field (type, f)) { if (dval0 == NULL) - dval = - value_from_contents_and_address (rtype, valaddr, address); + dval = value_from_contents_and_address (rtype, valaddr, address); else dval = dval0; - TYPE_FIELD_TYPE (rtype, f) = - ada_to_fixed_type - (ada_get_base_type - (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, f))), - cond_offset_host (valaddr, off / TARGET_CHAR_BIT), - cond_offset_target (address, off / TARGET_CHAR_BIT), - dval); + TYPE_FIELD_TYPE (rtype, f) = + ada_to_fixed_type + (ada_get_base_type + (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, f))), + cond_offset_host (valaddr, off / TARGET_CHAR_BIT), + cond_offset_target (address, off / TARGET_CHAR_BIT), dval); TYPE_FIELD_NAME (rtype, f) = TYPE_FIELD_NAME (type, f); bit_incr = fld_bit_len = TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, f)) * TARGET_CHAR_BIT; @@ -6316,7 +6100,7 @@ template_to_fixed_record_type (type, valaddr, address, dval0) TYPE_FIELD_TYPE (rtype, f) = TYPE_FIELD_TYPE (type, f); TYPE_FIELD_NAME (rtype, f) = TYPE_FIELD_NAME (type, f); if (TYPE_FIELD_BITSIZE (type, f) > 0) - bit_incr = fld_bit_len = + bit_incr = fld_bit_len = TYPE_FIELD_BITSIZE (rtype, f) = TYPE_FIELD_BITSIZE (type, f); else bit_incr = fld_bit_len = @@ -6330,7 +6114,7 @@ template_to_fixed_record_type (type, valaddr, address, dval0) TYPE_LENGTH (rtype) = align_value (TYPE_LENGTH (rtype), TYPE_LENGTH (type)); value_free_to_mark (mark); - if (TYPE_LENGTH (rtype) > varsize_limit) + if (TYPE_LENGTH (rtype) > varsize_limit) error ("record type with dynamic size is larger than varsize-limit"); return rtype; } @@ -6342,9 +6126,8 @@ template_to_fixed_record_type (type, valaddr, address, dval0) Representation note: to save space, we memoize the result of this function in the TYPE_TARGET_TYPE of the template type. */ -static struct type* -template_to_static_fixed_type (templ_type) - struct type* templ_type; +static struct type * +template_to_static_fixed_type (struct type *templ_type) { struct type *type; int nfields; @@ -6354,34 +6137,35 @@ template_to_static_fixed_type (templ_type) return TYPE_TARGET_TYPE (templ_type); nfields = TYPE_NFIELDS (templ_type); - TYPE_TARGET_TYPE (templ_type) = type = alloc_type (TYPE_OBJFILE (templ_type)); + TYPE_TARGET_TYPE (templ_type) = type = + alloc_type (TYPE_OBJFILE (templ_type)); TYPE_CODE (type) = TYPE_CODE (templ_type); INIT_CPLUS_SPECIFIC (type); TYPE_NFIELDS (type) = nfields; - TYPE_FIELDS (type) = (struct field*) + TYPE_FIELDS (type) = (struct field *) TYPE_ALLOC (type, nfields * sizeof (struct field)); memset (TYPE_FIELDS (type), 0, sizeof (struct field) * nfields); TYPE_NAME (type) = ada_type_name (templ_type); TYPE_TAG_NAME (type) = NULL; - /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ + /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* TYPE_FLAGS (type) |= TYPE_FLAG_FIXED_INSTANCE; */ TYPE_LENGTH (type) = 0; for (f = 0; f < nfields; f += 1) { TYPE_FIELD_BITPOS (type, f) = 0; - TYPE_FIELD_BITSIZE (type, f) = 0; + TYPE_FIELD_BITSIZE (type, f) = 0; if (is_dynamic_field (templ_type, f)) { - TYPE_FIELD_TYPE (type, f) = - to_static_fixed_type (TYPE_TARGET_TYPE + TYPE_FIELD_TYPE (type, f) = + to_static_fixed_type (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (templ_type, f))); TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (templ_type, f); } else { - TYPE_FIELD_TYPE (type, f) = + TYPE_FIELD_TYPE (type, f) = check_typedef (TYPE_FIELD_TYPE (templ_type, f)); TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (templ_type, f); } @@ -6393,15 +6177,12 @@ template_to_static_fixed_type (templ_type) /* A revision of TYPE0 -- a non-dynamic-sized record with a variant part -- in which the variant part is replaced with the appropriate branch. */ -static struct type* -to_record_with_fixed_variant_part (type, valaddr, address, dval) - struct type* type; - char* valaddr; - CORE_ADDR address; - struct value* dval; -{ - struct value* mark = value_mark(); - struct type* rtype; +static struct type * +to_record_with_fixed_variant_part (struct type *type, char *valaddr, + CORE_ADDR address, struct value *dval) +{ + struct value *mark = value_mark (); + struct type *rtype; struct type *branch_type; int nfields = TYPE_NFIELDS (type); @@ -6412,38 +6193,41 @@ to_record_with_fixed_variant_part (type, valaddr, address, dval) TYPE_CODE (rtype) = TYPE_CODE_STRUCT; INIT_CPLUS_SPECIFIC (type); TYPE_NFIELDS (rtype) = TYPE_NFIELDS (type); - TYPE_FIELDS (rtype) = - (struct field*) TYPE_ALLOC (rtype, nfields * sizeof (struct field)); - memcpy (TYPE_FIELDS (rtype), TYPE_FIELDS (type), + TYPE_FIELDS (rtype) = + (struct field *) TYPE_ALLOC (rtype, nfields * sizeof (struct field)); + memcpy (TYPE_FIELDS (rtype), TYPE_FIELDS (type), sizeof (struct field) * nfields); TYPE_NAME (rtype) = ada_type_name (type); TYPE_TAG_NAME (rtype) = NULL; - /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ + /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE; */ TYPE_LENGTH (rtype) = TYPE_LENGTH (type); - branch_type = - to_fixed_variant_branch_type - (TYPE_FIELD_TYPE (type, nfields - 1), - cond_offset_host (valaddr, - TYPE_FIELD_BITPOS (type, nfields-1) / TARGET_CHAR_BIT), - cond_offset_target (address, - TYPE_FIELD_BITPOS (type, nfields-1) / TARGET_CHAR_BIT), - dval); - if (branch_type == NULL) + branch_type = + to_fixed_variant_branch_type + (TYPE_FIELD_TYPE (type, nfields - 1), + cond_offset_host (valaddr, + TYPE_FIELD_BITPOS (type, + nfields - 1) / TARGET_CHAR_BIT), + cond_offset_target (address, + TYPE_FIELD_BITPOS (type, + nfields - 1) / TARGET_CHAR_BIT), + dval); + if (branch_type == NULL) { TYPE_NFIELDS (rtype) -= 1; - TYPE_LENGTH (rtype) -= TYPE_LENGTH (TYPE_FIELD_TYPE (type, nfields - 1)); + TYPE_LENGTH (rtype) -= + TYPE_LENGTH (TYPE_FIELD_TYPE (type, nfields - 1)); } else { - TYPE_FIELD_TYPE (rtype, nfields-1) = branch_type; - TYPE_FIELD_NAME (rtype, nfields-1) = "S"; - TYPE_FIELD_BITSIZE (rtype, nfields-1) = 0; + TYPE_FIELD_TYPE (rtype, nfields - 1) = branch_type; + TYPE_FIELD_NAME (rtype, nfields - 1) = "S"; + TYPE_FIELD_BITSIZE (rtype, nfields - 1) = 0; TYPE_LENGTH (rtype) += TYPE_LENGTH (branch_type); - - TYPE_LENGTH (TYPE_FIELD_TYPE (type, nfields - 1)); + -TYPE_LENGTH (TYPE_FIELD_TYPE (type, nfields - 1)); } - + return rtype; } @@ -6453,22 +6237,19 @@ to_record_with_fixed_variant_part (type, valaddr, address, dval) should be in DVAL, a record value; it should be NULL if the object at ADDR itself contains any necessary discriminant values. A variant field (unless unchecked) is replaced by a particular branch - of the variant. */ + of the variant. */ -static struct type* -to_fixed_record_type (type0, valaddr, address, dval) - struct type* type0; - char* valaddr; - CORE_ADDR address; - struct value* dval; +static struct type * +to_fixed_record_type (struct type *type0, char *valaddr, CORE_ADDR address, + struct value *dval) { - struct type* templ_type; + struct type *templ_type; /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE) - return type0; - */ - templ_type = dynamic_template_type (type0); + return type0; + */ + templ_type = dynamic_template_type (type0); if (templ_type != NULL) return template_to_fixed_record_type (templ_type, valaddr, address, dval); @@ -6476,7 +6257,7 @@ to_fixed_record_type (type0, valaddr, address, dval) return to_record_with_fixed_variant_part (type0, valaddr, address, dval); else { - /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ + /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* TYPE_FLAGS (type0) |= TYPE_FLAG_FIXED_INSTANCE; */ return type0; } @@ -6490,20 +6271,17 @@ to_fixed_record_type (type0, valaddr, address, dval) branch of the union at ADDR according to the discriminant value indicated in the union's type name. */ -static struct type* -to_fixed_variant_branch_type (var_type0, valaddr, address, dval) - struct type* var_type0; - char* valaddr; - CORE_ADDR address; - struct value* dval; +static struct type * +to_fixed_variant_branch_type (struct type *var_type0, char *valaddr, + CORE_ADDR address, struct value *dval) { int which; - struct type* templ_type; - struct type* var_type; + struct type *templ_type; + struct type *var_type; if (TYPE_CODE (var_type0) == TYPE_CODE_PTR) var_type = TYPE_TARGET_TYPE (var_type0); - else + else var_type = var_type0; templ_type = ada_find_parallel_type (var_type, "___XVU"); @@ -6511,21 +6289,21 @@ to_fixed_variant_branch_type (var_type0, valaddr, address, dval) if (templ_type != NULL) var_type = templ_type; - which = - ada_which_variant_applies (var_type, + which = + ada_which_variant_applies (var_type, VALUE_TYPE (dval), VALUE_CONTENTS (dval)); if (which < 0) return empty_record (TYPE_OBJFILE (var_type)); else if (is_dynamic_field (var_type, which)) - return - to_fixed_record_type - (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (var_type, which)), - valaddr, address, dval); + return + to_fixed_record_type + (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (var_type, which)), + valaddr, address, dval); else if (contains_variant_part (TYPE_FIELD_TYPE (var_type, which))) - return - to_fixed_record_type - (TYPE_FIELD_TYPE (var_type, which), valaddr, address, dval); + return + to_fixed_record_type + (TYPE_FIELD_TYPE (var_type, which), valaddr, address, dval); else return TYPE_FIELD_TYPE (var_type, which); } @@ -6539,19 +6317,17 @@ to_fixed_variant_branch_type (var_type0, valaddr, address, dval) varsize_limit. */ -static struct type* -to_fixed_array_type (type0, dval, ignore_too_big) - struct type* type0; - struct value* dval; - int ignore_too_big; +static struct type * +to_fixed_array_type (struct type *type0, struct value *dval, + int ignore_too_big) { - struct type* index_type_desc; - struct type* result; + struct type *index_type_desc; + struct type *result; /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ - /* if (ada_is_packed_array_type (type0) /* revisit? */ /* - || (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)) - return type0;*/ +/* if (ada_is_packed_array_type (type0) /* revisit? *//* + || (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)) + return type0; */ index_type_desc = ada_find_parallel_type (type0, "___XA"); if (index_type_desc == NULL) @@ -6559,14 +6335,13 @@ to_fixed_array_type (type0, dval, ignore_too_big) struct type *elt_type0 = check_typedef (TYPE_TARGET_TYPE (type0)); /* NOTE: elt_type---the fixed version of elt_type0---should never * depend on the contents of the array in properly constructed - * debugging data. */ - struct type *elt_type = - ada_to_fixed_type (elt_type0, 0, 0, dval); + * debugging data. */ + struct type *elt_type = ada_to_fixed_type (elt_type0, 0, 0, dval); if (elt_type0 == elt_type) result = type0; else - result = create_array_type (alloc_type (TYPE_OBJFILE (type0)), + result = create_array_type (alloc_type (TYPE_OBJFILE (type0)), elt_type, TYPE_INDEX_TYPE (type0)); } else @@ -6580,25 +6355,24 @@ to_fixed_array_type (type0, dval, ignore_too_big) /* NOTE: result---the fixed version of elt_type0---should never * depend on the contents of the array in properly constructed - * debugging data. */ - result = - ada_to_fixed_type (check_typedef (elt_type0), 0, 0, dval); + * debugging data. */ + result = ada_to_fixed_type (check_typedef (elt_type0), 0, 0, dval); for (i = TYPE_NFIELDS (index_type_desc) - 1; i >= 0; i -= 1) { - struct type *range_type = + struct type *range_type = to_fixed_range_type (TYPE_FIELD_NAME (index_type_desc, i), dval, TYPE_OBJFILE (type0)); result = create_array_type (alloc_type (TYPE_OBJFILE (type0)), result, range_type); } - if (! ignore_too_big && TYPE_LENGTH (result) > varsize_limit) + if (!ignore_too_big && TYPE_LENGTH (result) > varsize_limit) error ("array type with dynamic size is larger than varsize-limit"); } /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* TYPE_FLAGS (result) |= TYPE_FLAG_FIXED_INSTANCE; */ return result; -} +} /* A standard type (containing no dynamically sized components) @@ -6606,54 +6380,51 @@ to_fixed_array_type (type0, dval, ignore_too_big) DVAL describes a record containing any discriminants used in TYPE0, and may be NULL if there are none. */ -struct type* -ada_to_fixed_type (type, valaddr, address, dval) - struct type* type; - char* valaddr; - CORE_ADDR address; - struct value* dval; +struct type * +ada_to_fixed_type (struct type *type, char *valaddr, CORE_ADDR address, + struct value *dval) { CHECK_TYPEDEF (type); - switch (TYPE_CODE (type)) { - default: - return type; - case TYPE_CODE_STRUCT: - return to_fixed_record_type (type, valaddr, address, NULL); - case TYPE_CODE_ARRAY: - return to_fixed_array_type (type, dval, 0); - case TYPE_CODE_UNION: - if (dval == NULL) + switch (TYPE_CODE (type)) + { + default: return type; - else - return to_fixed_variant_branch_type (type, valaddr, address, dval); - } + case TYPE_CODE_STRUCT: + return to_fixed_record_type (type, valaddr, address, NULL); + case TYPE_CODE_ARRAY: + return to_fixed_array_type (type, dval, 0); + case TYPE_CODE_UNION: + if (dval == NULL) + return type; + else + return to_fixed_variant_branch_type (type, valaddr, address, dval); + } } /* A standard (static-sized) type corresponding as well as possible to TYPE0, but based on no runtime data. */ -static struct type* -to_static_fixed_type (type0) - struct type* type0; +static struct type * +to_static_fixed_type (struct type *type0) { - struct type* type; + struct type *type; if (type0 == NULL) return NULL; /* FIXME: TYPE_FLAG_FIXED_INSTANCE should be defined in gdbtypes.h */ /* if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE) - return type0; - */ + return type0; + */ CHECK_TYPEDEF (type0); - + switch (TYPE_CODE (type0)) { default: return type0; case TYPE_CODE_STRUCT: type = dynamic_template_type (type0); - if (type != NULL) + if (type != NULL) return template_to_static_fixed_type (type); return type0; case TYPE_CODE_UNION: @@ -6665,22 +6436,21 @@ to_static_fixed_type (type0) } /* A static approximation of TYPE with all type wrappers removed. */ -static struct type* -static_unwrap_type (type) - struct type* type; +static struct type * +static_unwrap_type (struct type *type) { if (ada_is_aligner_type (type)) { - struct type* type1 = TYPE_FIELD_TYPE (check_typedef (type), 0); + struct type *type1 = TYPE_FIELD_TYPE (check_typedef (type), 0); if (ada_type_name (type1) == NULL) TYPE_NAME (type1) = ada_type_name (type); return static_unwrap_type (type1); } - else + else { - struct type* raw_real_type = ada_get_base_type (type); - if (raw_real_type == type) + struct type *raw_real_type = ada_get_base_type (type); + if (raw_real_type == type) return type; else return to_static_fixed_type (raw_real_type); @@ -6700,19 +6470,18 @@ static_unwrap_type (type) /* A type equivalent to TYPE that is not a non-record stub, if one exists, otherwise TYPE. */ -struct type* -ada_completed_type (type) - struct type* type; +struct type * +ada_completed_type (struct type *type) { CHECK_TYPEDEF (type); if (type == NULL || TYPE_CODE (type) != TYPE_CODE_ENUM || (TYPE_FLAGS (type) & TYPE_FLAG_STUB) == 0 || TYPE_TAG_NAME (type) == NULL) return type; - else + else { - char* name = TYPE_TAG_NAME (type); - struct type* type1 = ada_find_any_type (name); + char *name = TYPE_TAG_NAME (type); + struct type *type1 = ada_find_any_type (name); return (type1 == NULL) ? type : type1; } } @@ -6721,19 +6490,17 @@ ada_completed_type (type) type TYPE0, but with a standard (static-sized) type that correctly describes it. If VAL0 is not NULL and TYPE0 already is a standard type, then return VAL0 [this feature is simply to avoid redundant - creation of struct values]. */ + creation of struct values]. */ -struct value* -ada_to_fixed_value (type0, valaddr, address, val0) - struct type* type0; - char* valaddr; - CORE_ADDR address; - struct value* val0; +struct value * +ada_to_fixed_value (struct type *type0, char *valaddr, CORE_ADDR address, + struct value *val0) { - struct type* type = ada_to_fixed_type (type0, valaddr, address, NULL); + struct type *type = ada_to_fixed_type (type0, valaddr, address, NULL); if (type == type0 && val0 != NULL) return val0; - else return value_from_contents_and_address (type, valaddr, address); + else + return value_from_contents_and_address (type, valaddr, address); } /* A value representing VAL, but with a standard (static-sized) type @@ -6741,20 +6508,19 @@ ada_to_fixed_value (type0, valaddr, address, val0) without consulting any runtime values. For Ada dynamic-sized types, therefore, the type of the result is likely to be inaccurate. */ -struct value* -ada_to_static_fixed_value (val) - struct value* val; +struct value * +ada_to_static_fixed_value (struct value *val) { - struct type *type = + struct type *type = to_static_fixed_type (static_unwrap_type (VALUE_TYPE (val))); if (type == VALUE_TYPE (val)) return val; else return coerce_unspec_val_to_type (val, 0, type); } + - /* Attributes */ @@ -6762,26 +6528,24 @@ ada_to_static_fixed_value (val) /* Table mapping attribute numbers to names */ /* NOTE: Keep up to date with enum ada_attribute definition in ada-lang.h */ -static const char* attribute_names[] = { +static const char *attribute_names[] = { "<?>", - "first", + "first", "last", "length", "image", "img", "max", "min", - "pos" - "tag", + "pos" "tag", "val", 0 }; -const char* -ada_attribute_name (n) - int n; +const char * +ada_attribute_name (int n) { if (n > 0 && n < (int) ATR_END) return attribute_names[n]; @@ -6791,13 +6555,12 @@ ada_attribute_name (n) /* Evaluate the 'POS attribute applied to ARG. */ -static struct value* -value_pos_atr (arg) - struct value* arg; +static struct value * +value_pos_atr (struct value *arg) { struct type *type = VALUE_TYPE (arg); - if (! discrete_type_p (type)) + if (!discrete_type_p (type)) error ("'POS only defined on discrete types"); if (TYPE_CODE (type) == TYPE_CODE_ENUM) @@ -6805,7 +6568,7 @@ value_pos_atr (arg) int i; LONGEST v = value_as_long (arg); - for (i = 0; i < TYPE_NFIELDS (type); i += 1) + for (i = 0; i < TYPE_NFIELDS (type); i += 1) { if (v == TYPE_FIELD_BITPOS (type, i)) return value_from_longest (builtin_type_ada_int, i); @@ -6818,14 +6581,12 @@ value_pos_atr (arg) /* Evaluate the TYPE'VAL attribute applied to ARG. */ -static struct value* -value_val_atr (type, arg) - struct type *type; - struct value* arg; +static struct value * +value_val_atr (struct type *type, struct value *arg) { - if (! discrete_type_p (type)) + if (!discrete_type_p (type)) error ("'VAL only defined on discrete types"); - if (! integer_type_p (VALUE_TYPE (arg))) + if (!integer_type_p (VALUE_TYPE (arg))) error ("'VAL requires integral argument"); if (TYPE_CODE (type) == TYPE_CODE_ENUM) @@ -6833,28 +6594,26 @@ value_val_atr (type, arg) long pos = value_as_long (arg); if (pos < 0 || pos >= TYPE_NFIELDS (type)) error ("argument to 'VAL out of range"); - return - value_from_longest (type, TYPE_FIELD_BITPOS (type, pos)); + return value_from_longest (type, TYPE_FIELD_BITPOS (type, pos)); } else return value_from_longest (type, value_as_long (arg)); } - + /* Evaluation */ /* True if TYPE appears to be an Ada character type. * [At the moment, this is true only for Character and Wide_Character; * It is a heuristic test that could stand improvement]. */ -int -ada_is_character_type (type) - struct type* type; +int +ada_is_character_type (struct type *type) { - const char* name = ada_type_name (type); - return + const char *name = ada_type_name (type); + return name != NULL - && (TYPE_CODE (type) == TYPE_CODE_CHAR + && (TYPE_CODE (type) == TYPE_CODE_CHAR || TYPE_CODE (type) == TYPE_CODE_INT || TYPE_CODE (type) == TYPE_CODE_RANGE) && (STREQ (name, "character") || STREQ (name, "wide_character") @@ -6864,11 +6623,10 @@ ada_is_character_type (type) /* True if TYPE appears to be an Ada string type. */ int -ada_is_string_type (type) - struct type *type; +ada_is_string_type (struct type *type) { CHECK_TYPEDEF (type); - if (type != NULL + if (type != NULL && TYPE_CODE (type) != TYPE_CODE_PTR && (ada_is_simple_array (type) || ada_is_array_descriptor (type)) && ada_array_arity (type) == 1) @@ -6877,7 +6635,7 @@ ada_is_string_type (type) return ada_is_character_type (elttype); } - else + else return 0; } @@ -6887,8 +6645,7 @@ ada_is_string_type (type) distinctive name. */ int -ada_is_aligner_type (type) - struct type *type; +ada_is_aligner_type (struct type *type) { CHECK_TYPEDEF (type); return (TYPE_CODE (type) == TYPE_CODE_STRUCT @@ -6899,35 +6656,33 @@ ada_is_aligner_type (type) /* If there is an ___XVS-convention type parallel to SUBTYPE, return the parallel type. */ -struct type* -ada_get_base_type (raw_type) - struct type* raw_type; +struct type * +ada_get_base_type (struct type *raw_type) { - struct type* real_type_namer; - struct type* raw_real_type; - struct type* real_type; + struct type *real_type_namer; + struct type *raw_real_type; + struct type *real_type; if (raw_type == NULL || TYPE_CODE (raw_type) != TYPE_CODE_STRUCT) return raw_type; real_type_namer = ada_find_parallel_type (raw_type, "___XVS"); - if (real_type_namer == NULL + if (real_type_namer == NULL || TYPE_CODE (real_type_namer) != TYPE_CODE_STRUCT || TYPE_NFIELDS (real_type_namer) != 1) return raw_type; raw_real_type = ada_find_any_type (TYPE_FIELD_NAME (real_type_namer, 0)); - if (raw_real_type == NULL) + if (raw_real_type == NULL) return raw_type; else return raw_real_type; -} +} /* The type of value designated by TYPE, with all aligners removed. */ -struct type* -ada_aligned_type (type) - struct type* type; +struct type * +ada_aligned_type (struct type *type) { if (ada_is_aligner_type (type)) return ada_aligned_type (TYPE_FIELD_TYPE (type, 0)); @@ -6939,33 +6694,31 @@ ada_aligned_type (type) /* The address of the aligned value in an object at address VALADDR having type TYPE. Assumes ada_is_aligner_type (TYPE). */ -char* -ada_aligned_value_addr (type, valaddr) - struct type *type; - char *valaddr; +char * +ada_aligned_value_addr (struct type *type, char *valaddr) { - if (ada_is_aligner_type (type)) + if (ada_is_aligner_type (type)) return ada_aligned_value_addr (TYPE_FIELD_TYPE (type, 0), - valaddr + - TYPE_FIELD_BITPOS (type, 0)/TARGET_CHAR_BIT); + valaddr + + TYPE_FIELD_BITPOS (type, + 0) / TARGET_CHAR_BIT); else return valaddr; } /* The printed representation of an enumeration literal with encoded name NAME. The value is good to the next call of ada_enum_name. */ -const char* -ada_enum_name (name) - const char* name; +const char * +ada_enum_name (const char *name) { - char* tmp; + char *tmp; - while (1) + while (1) { if ((tmp = strstr (name, "__")) != NULL) - name = tmp+2; + name = tmp + 2; else if ((tmp = strchr (name, '.')) != NULL) - name = tmp+1; + name = tmp + 1; else break; } @@ -6976,7 +6729,7 @@ ada_enum_name (name) int v; if (name[1] == 'U' || name[1] == 'W') { - if (sscanf (name+2, "%x", &v) != 1) + if (sscanf (name + 2, "%x", &v) != 1) return name; } else @@ -6991,16 +6744,13 @@ ada_enum_name (name) return result; } - else + else return name; } -static struct value* -evaluate_subexp (expect_type, exp, pos, noside) - struct type *expect_type; - struct expression *exp; - int *pos; - enum noside noside; +static struct value * +evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos, + enum noside noside) { return (*exp->language_defn->evaluate_exp) (expect_type, exp, pos, noside); } @@ -7009,65 +6759,60 @@ evaluate_subexp (expect_type, exp, pos, noside) evaluate_type, updating *POS to point just past the evaluated expression. */ -static struct value* -evaluate_subexp_type (exp, pos) - struct expression* exp; - int* pos; +static struct value * +evaluate_subexp_type (struct expression *exp, int *pos) { - return (*exp->language_defn->evaluate_exp) + return (*exp->language_defn->evaluate_exp) (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS); } /* If VAL is wrapped in an aligner or subtype wrapper, return the - value it wraps. */ + value it wraps. */ -static struct value* -unwrap_value (val) - struct value* val; +static struct value * +unwrap_value (struct value *val) { - struct type* type = check_typedef (VALUE_TYPE (val)); + struct type *type = check_typedef (VALUE_TYPE (val)); if (ada_is_aligner_type (type)) { - struct value* v = value_struct_elt (&val, NULL, "F", - NULL, "internal structure"); - struct type* val_type = check_typedef (VALUE_TYPE (v)); + struct value *v = value_struct_elt (&val, NULL, "F", + NULL, "internal structure"); + struct type *val_type = check_typedef (VALUE_TYPE (v)); if (ada_type_name (val_type) == NULL) TYPE_NAME (val_type) = ada_type_name (type); return unwrap_value (v); } - else + else { - struct type* raw_real_type = + struct type *raw_real_type = ada_completed_type (ada_get_base_type (type)); - + if (type == raw_real_type) return val; - return - coerce_unspec_val_to_type + return + coerce_unspec_val_to_type (val, 0, ada_to_fixed_type (raw_real_type, 0, VALUE_ADDRESS (val) + VALUE_OFFSET (val), NULL)); } } - -static struct value* -cast_to_fixed (type, arg) - struct type *type; - struct value* arg; + +static struct value * +cast_to_fixed (struct type *type, struct value *arg) { LONGEST val; if (type == VALUE_TYPE (arg)) return arg; else if (ada_is_fixed_point_type (VALUE_TYPE (arg))) - val = ada_float_to_fixed (type, + val = ada_float_to_fixed (type, ada_fixed_to_float (VALUE_TYPE (arg), value_as_long (arg))); - else + else { - DOUBLEST argd = + DOUBLEST argd = value_as_double (value_cast (builtin_type_double, value_copy (arg))); val = ada_float_to_fixed (type, argd); } @@ -7075,9 +6820,8 @@ cast_to_fixed (type, arg) return value_from_longest (type, val); } -static struct value* -cast_from_fixed_to_double (arg) - struct value* arg; +static struct value * +cast_from_fixed_to_double (struct value *arg) { DOUBLEST val = ada_fixed_to_float (VALUE_TYPE (arg), value_as_long (arg)); @@ -7086,42 +6830,38 @@ cast_from_fixed_to_double (arg) /* Coerce VAL as necessary for assignment to an lval of type TYPE, and * return the converted value. */ -static struct value* -coerce_for_assign (type, val) - struct type* type; - struct value* val; +static struct value * +coerce_for_assign (struct type *type, struct value *val) { - struct type* type2 = VALUE_TYPE (val); + struct type *type2 = VALUE_TYPE (val); if (type == type2) return val; CHECK_TYPEDEF (type2); CHECK_TYPEDEF (type); - if (TYPE_CODE (type2) == TYPE_CODE_PTR && TYPE_CODE (type) == TYPE_CODE_ARRAY) + if (TYPE_CODE (type2) == TYPE_CODE_PTR + && TYPE_CODE (type) == TYPE_CODE_ARRAY) { val = ada_value_ind (val); type2 = VALUE_TYPE (val); } - if (TYPE_CODE (type2) == TYPE_CODE_ARRAY + if (TYPE_CODE (type2) == TYPE_CODE_ARRAY && TYPE_CODE (type) == TYPE_CODE_ARRAY) { if (TYPE_LENGTH (type2) != TYPE_LENGTH (type) || TYPE_LENGTH (TYPE_TARGET_TYPE (type2)) - != TYPE_LENGTH (TYPE_TARGET_TYPE (type2))) + != TYPE_LENGTH (TYPE_TARGET_TYPE (type2))) error ("Incompatible types in assignment"); VALUE_TYPE (val) = type; } - return val; + return val; } -struct value* -ada_evaluate_subexp (expect_type, exp, pos, noside) - struct type *expect_type; - struct expression *exp; - int *pos; - enum noside noside; +struct value * +ada_evaluate_subexp (struct type *expect_type, struct expression *exp, + int *pos, enum noside noside) { enum exp_opcode op; enum ada_attribute atr; @@ -7130,16 +6870,19 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) struct value *arg1 = NULL, *arg2 = NULL, *arg3; struct type *type; int nargs; - struct value* *argvec; + struct value **argvec; - pc = *pos; *pos += 1; + pc = *pos; + *pos += 1; op = exp->elts[pc].opcode; - switch (op) + switch (op) { default: *pos -= 1; - return unwrap_value (evaluate_subexp_standard (expect_type, exp, pos, noside)); + return + unwrap_value (evaluate_subexp_standard + (expect_type, exp, pos, noside)); case UNOP_CAST: (*pos) += 2; @@ -7153,30 +6896,30 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) arg1 = cast_to_fixed (type, arg1); else if (ada_is_fixed_point_type (VALUE_TYPE (arg1))) arg1 = value_cast (type, cast_from_fixed_to_double (arg1)); - else if (VALUE_LVAL (arg1) == lval_memory) + else if (VALUE_LVAL (arg1) == lval_memory) { /* This is in case of the really obscure (and undocumented, - but apparently expected) case of (Foo) Bar.all, where Bar - is an integer constant and Foo is a dynamic-sized type. - If we don't do this, ARG1 will simply be relabeled with - TYPE. */ - if (noside == EVAL_AVOID_SIDE_EFFECTS) + but apparently expected) case of (Foo) Bar.all, where Bar + is an integer constant and Foo is a dynamic-sized type. + If we don't do this, ARG1 will simply be relabeled with + TYPE. */ + if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (to_static_fixed_type (type), not_lval); - arg1 = - ada_to_fixed_value - (type, 0, VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1), 0); + arg1 = + ada_to_fixed_value + (type, 0, VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1), 0); } - else - arg1 = value_cast (type, arg1); + else + arg1 = value_cast (type, arg1); } return arg1; /* FIXME: UNOP_QUAL should be defined in expression.h */ /* case UNOP_QUAL: - (*pos) += 2; - type = exp->elts[pc + 1].type; - return ada_evaluate_subexp (type, exp, pos, noside); - */ + (*pos) += 2; + type = exp->elts[pc + 1].type; + return ada_evaluate_subexp (type, exp, pos, noside); + */ case BINOP_ASSIGN: arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); arg2 = evaluate_subexp (VALUE_TYPE (arg1), exp, pos, noside); @@ -7184,13 +6927,14 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) return arg1; if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL, EVAL_NORMAL); - else + else { if (ada_is_fixed_point_type (VALUE_TYPE (arg1))) arg2 = cast_to_fixed (VALUE_TYPE (arg1), arg2); else if (ada_is_fixed_point_type (VALUE_TYPE (arg2))) - error ("Fixed-point values must be assigned to fixed-point variables"); - else + error + ("Fixed-point values must be assigned to fixed-point variables"); + else arg2 = coerce_for_assign (VALUE_TYPE (arg1), arg2); return ada_value_assign (arg1, arg2); } @@ -7207,7 +6951,8 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) if ((ada_is_fixed_point_type (VALUE_TYPE (arg1)) || ada_is_fixed_point_type (VALUE_TYPE (arg2))) && VALUE_TYPE (arg1) != VALUE_TYPE (arg2)) - error ("Operands of fixed-point addition must have the same type"); + error + ("Operands of fixed-point addition must have the same type"); return value_cast (VALUE_TYPE (arg1), value_add (arg1, arg2)); } @@ -7223,7 +6968,8 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) if ((ada_is_fixed_point_type (VALUE_TYPE (arg1)) || ada_is_fixed_point_type (VALUE_TYPE (arg2))) && VALUE_TYPE (arg1) != VALUE_TYPE (arg2)) - error ("Operands of fixed-point subtraction must have the same type"); + error + ("Operands of fixed-point subtraction must have the same type"); return value_cast (VALUE_TYPE (arg1), value_sub (arg1, arg2)); } @@ -7238,7 +6984,7 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) else if (noside == EVAL_AVOID_SIDE_EFFECTS && (op == BINOP_DIV || op == BINOP_REM || op == BINOP_MOD)) - return value_zero (VALUE_TYPE (arg1), not_lval); + return value_zero (VALUE_TYPE (arg1), not_lval); else { if (ada_is_fixed_point_type (VALUE_TYPE (arg1))) @@ -7261,38 +7007,39 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ /* case OP_UNRESOLVED_VALUE: - /* Only encountered when an unresolved symbol occurs in a + /* Only encountered when an unresolved symbol occurs in a context other than a function call, in which case, it is - illegal. *//* - (*pos) += 3; - if (noside == EVAL_SKIP) - goto nosideret; - else - error ("Unexpected unresolved symbol, %s, during evaluation", - ada_demangle (exp->elts[pc + 2].name)); - */ + illegal. *//* + (*pos) += 3; + if (noside == EVAL_SKIP) + goto nosideret; + else + error ("Unexpected unresolved symbol, %s, during evaluation", + ada_demangle (exp->elts[pc + 2].name)); + */ case OP_VAR_VALUE: *pos -= 1; if (noside == EVAL_SKIP) { *pos += 4; goto nosideret; - } + } else if (noside == EVAL_AVOID_SIDE_EFFECTS) { *pos += 4; - return value_zero - (to_static_fixed_type - (static_unwrap_type (SYMBOL_TYPE (exp->elts[pc+2].symbol))), + return value_zero + (to_static_fixed_type + (static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol))), not_lval); } - else + else { - arg1 = unwrap_value (evaluate_subexp_standard (expect_type, exp, pos, - noside)); + arg1 = + unwrap_value (evaluate_subexp_standard + (expect_type, exp, pos, noside)); return ada_to_fixed_value (VALUE_TYPE (arg1), 0, - VALUE_ADDRESS (arg1) + VALUE_OFFSET(arg1), - arg1); + VALUE_ADDRESS (arg1) + + VALUE_OFFSET (arg1), arg1); } case OP_ARRAY: @@ -7302,7 +7049,8 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) nargs = tem3 - tem2 + 1; type = expect_type ? check_typedef (expect_type) : NULL_TYPE; - argvec = (struct value* *) alloca (sizeof (struct value*) * (nargs + 1)); + argvec = + (struct value * *) alloca (sizeof (struct value *) * (nargs + 1)); for (tem = 0; tem == 0 || tem < nargs; tem += 1) /* At least one element gets inserted for the type */ { @@ -7317,17 +7065,18 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) (*pos) += 2; /* Allocate arg vector, including space for the function to be - called in argvec[0] and a terminating NULL */ + called in argvec[0] and a terminating NULL */ nargs = longest_to_int (exp->elts[pc + 1].longconst); - argvec = (struct value* *) alloca (sizeof (struct value*) * (nargs + 2)); + argvec = + (struct value * *) alloca (sizeof (struct value *) * (nargs + 2)); /* FIXME: OP_UNRESOLVED_VALUE should be defined in expression.h */ /* FIXME: name should be defined in expresion.h */ /* if (exp->elts[*pos].opcode == OP_UNRESOLVED_VALUE) - error ("Unexpected unresolved symbol, %s, during evaluation", - ada_demangle (exp->elts[pc + 5].name)); - */ - if (0) + error ("Unexpected unresolved symbol, %s, during evaluation", + ada_demangle (exp->elts[pc + 5].name)); + */ + if (0) { error ("unexpected code path, FIXME"); } @@ -7349,7 +7098,7 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) type = check_typedef (VALUE_TYPE (argvec[0])); if (TYPE_CODE (type) == TYPE_CODE_PTR) - { + { switch (TYPE_CODE (check_typedef (TYPE_TARGET_TYPE (type)))) { case TYPE_CODE_FUNC: @@ -7366,53 +7115,55 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) error ("cannot subscript or call something of type `%s'", ada_type_name (VALUE_TYPE (argvec[0]))); break; - } + } } - + switch (TYPE_CODE (type)) { case TYPE_CODE_FUNC: if (noside == EVAL_AVOID_SIDE_EFFECTS) return allocate_value (TYPE_TARGET_TYPE (type)); return call_function_by_hand (argvec[0], nargs, argvec + 1); - case TYPE_CODE_STRUCT: + case TYPE_CODE_STRUCT: { int arity = ada_array_arity (type); type = ada_array_element_type (type, nargs); - if (type == NULL) + if (type == NULL) error ("cannot subscript or call a record"); - if (arity != nargs) + if (arity != nargs) error ("wrong number of subscripts; expecting %d", arity); - if (noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return allocate_value (ada_aligned_type (type)); - return unwrap_value (ada_value_subscript (argvec[0], nargs, argvec+1)); + return + unwrap_value (ada_value_subscript + (argvec[0], nargs, argvec + 1)); } case TYPE_CODE_ARRAY: if (noside == EVAL_AVOID_SIDE_EFFECTS) - { + { type = ada_array_element_type (type, nargs); if (type == NULL) error ("element type of array unknown"); else return allocate_value (ada_aligned_type (type)); } - return + return unwrap_value (ada_value_subscript (ada_coerce_to_simple_array (argvec[0]), - nargs, argvec+1)); - case TYPE_CODE_PTR: /* Pointer to array */ + nargs, argvec + 1)); + case TYPE_CODE_PTR: /* Pointer to array */ type = to_fixed_array_type (TYPE_TARGET_TYPE (type), NULL, 1); if (noside == EVAL_AVOID_SIDE_EFFECTS) - { + { type = ada_array_element_type (type, nargs); if (type == NULL) error ("element type of array unknown"); else return allocate_value (ada_aligned_type (type)); } - return - unwrap_value (ada_value_ptr_subscript (argvec[0], type, - nargs, argvec+1)); + return + unwrap_value (ada_value_ptr_subscript (argvec[0], type, + nargs, argvec + 1)); default: error ("Internal error in evaluate_subexp"); @@ -7420,47 +7171,46 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) case TERNOP_SLICE: { - struct value* array = evaluate_subexp (NULL_TYPE, exp, pos, noside); + struct value *array = evaluate_subexp (NULL_TYPE, exp, pos, noside); int lowbound = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); int upper = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); if (noside == EVAL_SKIP) goto nosideret; - - /* If this is a reference to an array, then dereference it */ - if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_REF - && TYPE_TARGET_TYPE (VALUE_TYPE (array)) != NULL - && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (array))) == - TYPE_CODE_ARRAY - && !ada_is_array_descriptor (check_typedef (VALUE_TYPE - (array)))) - { - array = ada_coerce_ref (array); - } + + /* If this is a reference to an array, then dereference it */ + if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_REF + && TYPE_TARGET_TYPE (VALUE_TYPE (array)) != NULL + && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (array))) == + TYPE_CODE_ARRAY + && !ada_is_array_descriptor (check_typedef (VALUE_TYPE (array)))) + { + array = ada_coerce_ref (array); + } if (noside == EVAL_AVOID_SIDE_EFFECTS && ada_is_array_descriptor (check_typedef (VALUE_TYPE (array)))) { /* Try to dereference the array, in case it is an access to array */ - struct type * arrType = ada_type_of_array (array, 0); + struct type *arrType = ada_type_of_array (array, 0); if (arrType != NULL) - array = value_at_lazy (arrType, 0, NULL); + array = value_at_lazy (arrType, 0, NULL); } if (ada_is_array_descriptor (VALUE_TYPE (array))) array = ada_coerce_to_simple_array (array); - /* If at this point we have a pointer to an array, it means that - it is a pointer to a simple (non-ada) array. We just then - dereference it */ - if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_PTR - && TYPE_TARGET_TYPE (VALUE_TYPE (array)) != NULL - && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (array))) == - TYPE_CODE_ARRAY) - { - array = ada_value_ind (array); - } - + /* If at this point we have a pointer to an array, it means that + it is a pointer to a simple (non-ada) array. We just then + dereference it */ + if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_PTR + && TYPE_TARGET_TYPE (VALUE_TYPE (array)) != NULL + && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (array))) == + TYPE_CODE_ARRAY) + { + array = ada_value_ind (array); + } + if (noside == EVAL_AVOID_SIDE_EFFECTS) /* The following will get the bounds wrong, but only in contexts where the value is not being requested (FIXME?). */ @@ -7471,295 +7221,295 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) /* FIXME: UNOP_MBR should be defined in expression.h */ /* case UNOP_MBR: - (*pos) += 2; - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - type = exp->elts[pc + 1].type; - - if (noside == EVAL_SKIP) - goto nosideret; - - switch (TYPE_CODE (type)) - { - default: - warning ("Membership test incompletely implemented; always returns true"); - return value_from_longest (builtin_type_int, (LONGEST) 1); - - case TYPE_CODE_RANGE: - arg2 = value_from_longest (builtin_type_int, - (LONGEST) TYPE_LOW_BOUND (type)); - arg3 = value_from_longest (builtin_type_int, - (LONGEST) TYPE_HIGH_BOUND (type)); - return - value_from_longest (builtin_type_int, - (value_less (arg1,arg3) - || value_equal (arg1,arg3)) - && (value_less (arg2,arg1) - || value_equal (arg2,arg1))); - } - */ - /* FIXME: BINOP_MBR should be defined in expression.h */ + (*pos) += 2; + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + type = exp->elts[pc + 1].type; + + if (noside == EVAL_SKIP) + goto nosideret; + + switch (TYPE_CODE (type)) + { + default: + warning ("Membership test incompletely implemented; always returns true"); + return value_from_longest (builtin_type_int, (LONGEST) 1); + + case TYPE_CODE_RANGE: + arg2 = value_from_longest (builtin_type_int, + (LONGEST) TYPE_LOW_BOUND (type)); + arg3 = value_from_longest (builtin_type_int, + (LONGEST) TYPE_HIGH_BOUND (type)); + return + value_from_longest (builtin_type_int, + (value_less (arg1,arg3) + || value_equal (arg1,arg3)) + && (value_less (arg2,arg1) + || value_equal (arg2,arg1))); + } + */ + /* FIXME: BINOP_MBR should be defined in expression.h */ /* case BINOP_MBR: - (*pos) += 2; - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + (*pos) += 2; + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; + if (noside == EVAL_SKIP) + goto nosideret; - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (builtin_type_int, not_lval); + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (builtin_type_int, not_lval); - tem = longest_to_int (exp->elts[pc + 1].longconst); + tem = longest_to_int (exp->elts[pc + 1].longconst); - if (tem < 1 || tem > ada_array_arity (VALUE_TYPE (arg2))) - error ("invalid dimension number to '%s", "range"); + if (tem < 1 || tem > ada_array_arity (VALUE_TYPE (arg2))) + error ("invalid dimension number to '%s", "range"); - arg3 = ada_array_bound (arg2, tem, 1); - arg2 = ada_array_bound (arg2, tem, 0); + arg3 = ada_array_bound (arg2, tem, 1); + arg2 = ada_array_bound (arg2, tem, 0); - return - value_from_longest (builtin_type_int, - (value_less (arg1,arg3) - || value_equal (arg1,arg3)) - && (value_less (arg2,arg1) - || value_equal (arg2,arg1))); - */ + return + value_from_longest (builtin_type_int, + (value_less (arg1,arg3) + || value_equal (arg1,arg3)) + && (value_less (arg2,arg1) + || value_equal (arg2,arg1))); + */ /* FIXME: TERNOP_MBR should be defined in expression.h */ /* case TERNOP_MBR: - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - arg3 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - - if (noside == EVAL_SKIP) - goto nosideret; - - return - value_from_longest (builtin_type_int, - (value_less (arg1,arg3) - || value_equal (arg1,arg3)) - && (value_less (arg2,arg1) - || value_equal (arg2,arg1))); - */ + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + arg3 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + + if (noside == EVAL_SKIP) + goto nosideret; + + return + value_from_longest (builtin_type_int, + (value_less (arg1,arg3) + || value_equal (arg1,arg3)) + && (value_less (arg2,arg1) + || value_equal (arg2,arg1))); + */ /* FIXME: OP_ATTRIBUTE should be defined in expression.h */ /* case OP_ATTRIBUTE: - *pos += 3; - atr = (enum ada_attribute) longest_to_int (exp->elts[pc + 2].longconst); - switch (atr) - { - default: - error ("unexpected attribute encountered"); - - case ATR_FIRST: - case ATR_LAST: - case ATR_LENGTH: - { - struct type* type_arg; - if (exp->elts[*pos].opcode == OP_TYPE) - { - evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); - arg1 = NULL; - type_arg = exp->elts[pc + 5].type; - } - else - { - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - type_arg = NULL; - } - - if (exp->elts[*pos].opcode != OP_LONG) - error ("illegal operand to '%s", ada_attribute_name (atr)); - tem = longest_to_int (exp->elts[*pos+2].longconst); - *pos += 4; - - if (noside == EVAL_SKIP) - goto nosideret; - - if (type_arg == NULL) - { - arg1 = ada_coerce_ref (arg1); - - if (ada_is_packed_array_type (VALUE_TYPE (arg1))) - arg1 = ada_coerce_to_simple_array (arg1); - - if (tem < 1 || tem > ada_array_arity (VALUE_TYPE (arg1))) - error ("invalid dimension number to '%s", - ada_attribute_name (atr)); - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - type = ada_index_type (VALUE_TYPE (arg1), tem); - if (type == NULL) - error ("attempt to take bound of something that is not an array"); - return allocate_value (type); - } - - switch (atr) - { - default: - error ("unexpected attribute encountered"); - case ATR_FIRST: - return ada_array_bound (arg1, tem, 0); - case ATR_LAST: - return ada_array_bound (arg1, tem, 1); - case ATR_LENGTH: - return ada_array_length (arg1, tem); - } - } - else if (TYPE_CODE (type_arg) == TYPE_CODE_RANGE - || TYPE_CODE (type_arg) == TYPE_CODE_INT) - { - struct type* range_type; - char* name = ada_type_name (type_arg); - if (name == NULL) - { - if (TYPE_CODE (type_arg) == TYPE_CODE_RANGE) - range_type = type_arg; - else - error ("unimplemented type attribute"); - } - else - range_type = - to_fixed_range_type (name, NULL, TYPE_OBJFILE (type_arg)); - switch (atr) - { - default: - error ("unexpected attribute encountered"); - case ATR_FIRST: - return value_from_longest (TYPE_TARGET_TYPE (range_type), - TYPE_LOW_BOUND (range_type)); - case ATR_LAST: - return value_from_longest (TYPE_TARGET_TYPE (range_type), - TYPE_HIGH_BOUND (range_type)); - } - } - else if (TYPE_CODE (type_arg) == TYPE_CODE_ENUM) - { - switch (atr) - { - default: - error ("unexpected attribute encountered"); - case ATR_FIRST: - return value_from_longest - (type_arg, TYPE_FIELD_BITPOS (type_arg, 0)); - case ATR_LAST: - return value_from_longest - (type_arg, - TYPE_FIELD_BITPOS (type_arg, - TYPE_NFIELDS (type_arg) - 1)); - } - } - else if (TYPE_CODE (type_arg) == TYPE_CODE_FLT) - error ("unimplemented type attribute"); - else - { - LONGEST low, high; - - if (ada_is_packed_array_type (type_arg)) - type_arg = decode_packed_array_type (type_arg); - - if (tem < 1 || tem > ada_array_arity (type_arg)) - error ("invalid dimension number to '%s", - ada_attribute_name (atr)); - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - type = ada_index_type (type_arg, tem); - if (type == NULL) - error ("attempt to take bound of something that is not an array"); - return allocate_value (type); - } - - switch (atr) - { - default: - error ("unexpected attribute encountered"); - case ATR_FIRST: - low = ada_array_bound_from_type (type_arg, tem, 0, &type); - return value_from_longest (type, low); - case ATR_LAST: - high = ada_array_bound_from_type (type_arg, tem, 1, &type); - return value_from_longest (type, high); - case ATR_LENGTH: - low = ada_array_bound_from_type (type_arg, tem, 0, &type); - high = ada_array_bound_from_type (type_arg, tem, 1, NULL); - return value_from_longest (type, high-low+1); - } - } - } - - case ATR_TAG: - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return - value_zero (ada_tag_type (arg1), not_lval); - - return ada_value_tag (arg1); - - case ATR_MIN: - case ATR_MAX: - evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (VALUE_TYPE (arg1), not_lval); - else - return value_binop (arg1, arg2, - atr == ATR_MIN ? BINOP_MIN : BINOP_MAX); - - case ATR_MODULUS: - { - struct type* type_arg = exp->elts[pc + 5].type; - evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); - *pos += 4; - - if (noside == EVAL_SKIP) - goto nosideret; - - if (! ada_is_modular_type (type_arg)) - error ("'modulus must be applied to modular type"); - - return value_from_longest (TYPE_TARGET_TYPE (type_arg), - ada_modulus (type_arg)); - } - - - case ATR_POS: - evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (builtin_type_ada_int, not_lval); - else - return value_pos_atr (arg1); - - case ATR_SIZE: - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (builtin_type_ada_int, not_lval); - else - return value_from_longest (builtin_type_ada_int, - TARGET_CHAR_BIT - * TYPE_LENGTH (VALUE_TYPE (arg1))); - - case ATR_VAL: - evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - type = exp->elts[pc + 5].type; - if (noside == EVAL_SKIP) - goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (type, not_lval); - else - return value_val_atr (type, arg1); - }*/ + *pos += 3; + atr = (enum ada_attribute) longest_to_int (exp->elts[pc + 2].longconst); + switch (atr) + { + default: + error ("unexpected attribute encountered"); + + case ATR_FIRST: + case ATR_LAST: + case ATR_LENGTH: + { + struct type* type_arg; + if (exp->elts[*pos].opcode == OP_TYPE) + { + evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); + arg1 = NULL; + type_arg = exp->elts[pc + 5].type; + } + else + { + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + type_arg = NULL; + } + + if (exp->elts[*pos].opcode != OP_LONG) + error ("illegal operand to '%s", ada_attribute_name (atr)); + tem = longest_to_int (exp->elts[*pos+2].longconst); + *pos += 4; + + if (noside == EVAL_SKIP) + goto nosideret; + + if (type_arg == NULL) + { + arg1 = ada_coerce_ref (arg1); + + if (ada_is_packed_array_type (VALUE_TYPE (arg1))) + arg1 = ada_coerce_to_simple_array (arg1); + + if (tem < 1 || tem > ada_array_arity (VALUE_TYPE (arg1))) + error ("invalid dimension number to '%s", + ada_attribute_name (atr)); + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + type = ada_index_type (VALUE_TYPE (arg1), tem); + if (type == NULL) + error ("attempt to take bound of something that is not an array"); + return allocate_value (type); + } + + switch (atr) + { + default: + error ("unexpected attribute encountered"); + case ATR_FIRST: + return ada_array_bound (arg1, tem, 0); + case ATR_LAST: + return ada_array_bound (arg1, tem, 1); + case ATR_LENGTH: + return ada_array_length (arg1, tem); + } + } + else if (TYPE_CODE (type_arg) == TYPE_CODE_RANGE + || TYPE_CODE (type_arg) == TYPE_CODE_INT) + { + struct type* range_type; + char* name = ada_type_name (type_arg); + if (name == NULL) + { + if (TYPE_CODE (type_arg) == TYPE_CODE_RANGE) + range_type = type_arg; + else + error ("unimplemented type attribute"); + } + else + range_type = + to_fixed_range_type (name, NULL, TYPE_OBJFILE (type_arg)); + switch (atr) + { + default: + error ("unexpected attribute encountered"); + case ATR_FIRST: + return value_from_longest (TYPE_TARGET_TYPE (range_type), + TYPE_LOW_BOUND (range_type)); + case ATR_LAST: + return value_from_longest (TYPE_TARGET_TYPE (range_type), + TYPE_HIGH_BOUND (range_type)); + } + } + else if (TYPE_CODE (type_arg) == TYPE_CODE_ENUM) + { + switch (atr) + { + default: + error ("unexpected attribute encountered"); + case ATR_FIRST: + return value_from_longest + (type_arg, TYPE_FIELD_BITPOS (type_arg, 0)); + case ATR_LAST: + return value_from_longest + (type_arg, + TYPE_FIELD_BITPOS (type_arg, + TYPE_NFIELDS (type_arg) - 1)); + } + } + else if (TYPE_CODE (type_arg) == TYPE_CODE_FLT) + error ("unimplemented type attribute"); + else + { + LONGEST low, high; + + if (ada_is_packed_array_type (type_arg)) + type_arg = decode_packed_array_type (type_arg); + + if (tem < 1 || tem > ada_array_arity (type_arg)) + error ("invalid dimension number to '%s", + ada_attribute_name (atr)); + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + type = ada_index_type (type_arg, tem); + if (type == NULL) + error ("attempt to take bound of something that is not an array"); + return allocate_value (type); + } + + switch (atr) + { + default: + error ("unexpected attribute encountered"); + case ATR_FIRST: + low = ada_array_bound_from_type (type_arg, tem, 0, &type); + return value_from_longest (type, low); + case ATR_LAST: + high = ada_array_bound_from_type (type_arg, tem, 1, &type); + return value_from_longest (type, high); + case ATR_LENGTH: + low = ada_array_bound_from_type (type_arg, tem, 0, &type); + high = ada_array_bound_from_type (type_arg, tem, 1, NULL); + return value_from_longest (type, high-low+1); + } + } + } + + case ATR_TAG: + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) + goto nosideret; + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return + value_zero (ada_tag_type (arg1), not_lval); + + return ada_value_tag (arg1); + + case ATR_MIN: + case ATR_MAX: + evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) + goto nosideret; + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (VALUE_TYPE (arg1), not_lval); + else + return value_binop (arg1, arg2, + atr == ATR_MIN ? BINOP_MIN : BINOP_MAX); + + case ATR_MODULUS: + { + struct type* type_arg = exp->elts[pc + 5].type; + evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); + *pos += 4; + + if (noside == EVAL_SKIP) + goto nosideret; + + if (! ada_is_modular_type (type_arg)) + error ("'modulus must be applied to modular type"); + + return value_from_longest (TYPE_TARGET_TYPE (type_arg), + ada_modulus (type_arg)); + } + + + case ATR_POS: + evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) + goto nosideret; + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (builtin_type_ada_int, not_lval); + else + return value_pos_atr (arg1); + + case ATR_SIZE: + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) + goto nosideret; + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (builtin_type_ada_int, not_lval); + else + return value_from_longest (builtin_type_ada_int, + TARGET_CHAR_BIT + * TYPE_LENGTH (VALUE_TYPE (arg1))); + + case ATR_VAL: + evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + type = exp->elts[pc + 5].type; + if (noside == EVAL_SKIP) + goto nosideret; + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (type, not_lval); + else + return value_val_atr (type, arg1); + } */ case BINOP_EXP: arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); @@ -7767,10 +7517,9 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) return unwrap_value (value_x_binop (arg1, arg2, op, OP_NULL, - EVAL_NORMAL)); - else - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (VALUE_TYPE (arg1), not_lval); + EVAL_NORMAL)); + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (VALUE_TYPE (arg1), not_lval); else return value_binop (arg1, arg2, op); @@ -7794,7 +7543,7 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) case UNOP_IND: if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR) - expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type)); + expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type)); arg1 = evaluate_subexp (expect_type, exp, pos, noside); if (noside == EVAL_SKIP) goto nosideret; @@ -7804,21 +7553,20 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) if (ada_is_array_descriptor (type)) /* GDB allows dereferencing GNAT array descriptors. */ { - struct type* arrType = ada_type_of_array (arg1, 0); + struct type *arrType = ada_type_of_array (arg1, 0); if (arrType == NULL) error ("Attempt to dereference null array pointer."); return value_at_lazy (arrType, 0, NULL); } else if (TYPE_CODE (type) == TYPE_CODE_PTR - || TYPE_CODE (type) == TYPE_CODE_REF - /* In C you can dereference an array to get the 1st elt. */ - || TYPE_CODE (type) == TYPE_CODE_ARRAY - ) - return - value_zero - (to_static_fixed_type - (ada_aligned_type (check_typedef (TYPE_TARGET_TYPE (type)))), - lval_memory); + || TYPE_CODE (type) == TYPE_CODE_REF + /* In C you can dereference an array to get the 1st elt. */ + || TYPE_CODE (type) == TYPE_CODE_ARRAY) + return + value_zero + (to_static_fixed_type + (ada_aligned_type (check_typedef (TYPE_TARGET_TYPE (type)))), + lval_memory); else if (TYPE_CODE (type) == TYPE_CODE_INT) /* GDB allows dereferencing an int. */ return value_zero (builtin_type_int, lval_memory); @@ -7827,7 +7575,7 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) } arg1 = ada_coerce_ref (arg1); type = check_typedef (VALUE_TYPE (arg1)); - + if (ada_is_array_descriptor (type)) /* GDB allows dereferencing GNAT array descriptors. */ return ada_coerce_to_simple_array (arg1); @@ -7841,9 +7589,10 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) if (noside == EVAL_SKIP) goto nosideret; if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (ada_aligned_type + return value_zero (ada_aligned_type (ada_lookup_struct_elt_type (VALUE_TYPE (arg1), - &exp->elts[pc + 2].string, + &exp->elts[pc + + 2].string, 0, NULL)), lval_memory); else @@ -7858,9 +7607,9 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) goto nosideret; else if (noside == EVAL_AVOID_SIDE_EFFECTS) return allocate_value (builtin_type_void); - else + else error ("Attempt to use a type name as an expression"); - + case STRUCTOP_PTR: tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); @@ -7868,9 +7617,10 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) if (noside == EVAL_SKIP) goto nosideret; if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (ada_aligned_type + return value_zero (ada_aligned_type (ada_lookup_struct_elt_type (VALUE_TYPE (arg1), - &exp->elts[pc + 2].string, + &exp->elts[pc + + 2].string, 0, NULL)), lval_memory); else @@ -7882,28 +7632,26 @@ ada_evaluate_subexp (expect_type, exp, pos, noside) nosideret: return value_from_longest (builtin_type_long, (LONGEST) 1); } - + /* Fixed point */ /* If TYPE encodes an Ada fixed-point type, return the suffix of the type name that encodes the 'small and 'delta information. Otherwise, return NULL. */ -static const char* -fixed_type_info (type) - struct type *type; +static const char * +fixed_type_info (struct type *type) { - const char* name = ada_type_name (type); + const char *name = ada_type_name (type); enum type_code code = (type == NULL) ? TYPE_CODE_UNDEF : TYPE_CODE (type); - if ((code == TYPE_CODE_INT || code == TYPE_CODE_RANGE) - && name != NULL) - { + if ((code == TYPE_CODE_INT || code == TYPE_CODE_RANGE) && name != NULL) + { const char *tail = strstr (name, "___XF_"); if (tail == NULL) return NULL; - else + else return tail + 5; } else if (code == TYPE_CODE_RANGE && TYPE_TARGET_TYPE (type) != type) @@ -7915,8 +7663,7 @@ fixed_type_info (type) /* Returns non-zero iff TYPE represents an Ada fixed-point type. */ int -ada_is_fixed_point_type (type) - struct type *type; +ada_is_fixed_point_type (struct type *type) { return fixed_type_info (type) != NULL; } @@ -7926,15 +7673,14 @@ ada_is_fixed_point_type (type) delta cannot be determined. */ DOUBLEST -ada_delta (type) - struct type *type; +ada_delta (struct type *type) { const char *encoding = fixed_type_info (type); long num, den; if (sscanf (encoding, "_%ld_%ld", &num, &den) < 2) return -1.0; - else + else return (DOUBLEST) num / (DOUBLEST) den; } @@ -7942,20 +7688,19 @@ ada_delta (type) factor ('SMALL value) associated with the type. */ static DOUBLEST -scaling_factor (type) - struct type *type; +scaling_factor (struct type *type) { const char *encoding = fixed_type_info (type); unsigned long num0, den0, num1, den1; int n; - + n = sscanf (encoding, "_%lu_%lu_%lu_%lu", &num0, &den0, &num1, &den1); if (n < 2) return 1.0; else if (n == 4) return (DOUBLEST) num1 / (DOUBLEST) den1; - else + else return (DOUBLEST) num0 / (DOUBLEST) den0; } @@ -7964,20 +7709,16 @@ scaling_factor (type) type TYPE, return its floating-point equivalent. */ DOUBLEST -ada_fixed_to_float (type, x) - struct type *type; - LONGEST x; +ada_fixed_to_float (struct type *type, LONGEST x) { - return (DOUBLEST) x * scaling_factor (type); + return (DOUBLEST) x *scaling_factor (type); } /* The representation of a fixed-point value of type TYPE corresponding to the value X. */ LONGEST -ada_float_to_fixed (type, x) - struct type *type; - DOUBLEST x; +ada_float_to_fixed (struct type *type, DOUBLEST x) { return (LONGEST) (x / scaling_factor (type) + 0.5); } @@ -7988,14 +7729,13 @@ ada_float_to_fixed (type, x) /* Non-zero iff TYPE represents one of the special VAX floating-point types. */ int -ada_is_vax_floating_type (type) - struct type* type; +ada_is_vax_floating_type (struct type *type) { - int name_len = + int name_len = (ada_type_name (type) == NULL) ? 0 : strlen (ada_type_name (type)); - return + return name_len > 6 - && (TYPE_CODE (type) == TYPE_CODE_INT + && (TYPE_CODE (type) == TYPE_CODE_INT || TYPE_CODE (type) == TYPE_CODE_RANGE) && STREQN (ada_type_name (type) + name_len - 6, "___XF", 5); } @@ -8003,36 +7743,31 @@ ada_is_vax_floating_type (type) /* The type of special VAX floating-point type this is, assuming ada_is_vax_floating_point */ int -ada_vax_float_type_suffix (type) - struct type* type; +ada_vax_float_type_suffix (struct type *type) { - return ada_type_name (type)[strlen (ada_type_name (type))-1]; + return ada_type_name (type)[strlen (ada_type_name (type)) - 1]; } /* A value representing the special debugging function that outputs VAX floating-point values of the type represented by TYPE. Assumes ada_is_vax_floating_type (TYPE). */ -struct value* -ada_vax_float_print_function (type) - - struct type* type; -{ - switch (ada_vax_float_type_suffix (type)) { - case 'F': - return - get_var_value ("DEBUG_STRING_F", 0); - case 'D': - return - get_var_value ("DEBUG_STRING_D", 0); - case 'G': - return - get_var_value ("DEBUG_STRING_G", 0); - default: - error ("invalid VAX floating-point type"); - } +struct value * +ada_vax_float_print_function (struct type *type) +{ + switch (ada_vax_float_type_suffix (type)) + { + case 'F': + return get_var_value ("DEBUG_STRING_F", 0); + case 'D': + return get_var_value ("DEBUG_STRING_D", 0); + case 'G': + return get_var_value ("DEBUG_STRING_G", 0); + default: + error ("invalid VAX floating-point type"); + } } - + /* Range types */ /* Scan STR beginning at position K for a discriminant name, and @@ -8042,39 +7777,34 @@ ada_vax_float_print_function (type) not alter *PX and *PNEW_K if unsuccessful. */ static int -scan_discrim_bound (str, k, dval, px, pnew_k) - char *str; - int k; - struct value* dval; - LONGEST *px; - int *pnew_k; +scan_discrim_bound (char *, int k, struct value *dval, LONGEST * px, + int *pnew_k) { static char *bound_buffer = NULL; static size_t bound_buffer_len = 0; char *bound; char *pend; - struct value* bound_val; + struct value *bound_val; if (dval == NULL || str == NULL || str[k] == '\0') return 0; - pend = strstr (str+k, "__"); + pend = strstr (str + k, "__"); if (pend == NULL) { - bound = str+k; + bound = str + k; k += strlen (bound); } - else + else { - GROW_VECT (bound_buffer, bound_buffer_len, pend - (str+k) + 1); + GROW_VECT (bound_buffer, bound_buffer_len, pend - (str + k) + 1); bound = bound_buffer; - strncpy (bound_buffer, str+k, pend-(str+k)); - bound[pend-(str+k)] = '\0'; - k = pend-str; + strncpy (bound_buffer, str + k, pend - (str + k)); + bound[pend - (str + k)] = '\0'; + k = pend - str; } - - bound_val = - ada_search_struct_field (bound, dval, 0, VALUE_TYPE (dval)); + + bound_val = ada_search_struct_field (bound, dval, 0, VALUE_TYPE (dval)); if (bound_val == NULL) return 0; @@ -8087,17 +7817,16 @@ scan_discrim_bound (str, k, dval, px, pnew_k) /* Value of variable named NAME in the current environment. If no such variable found, then if ERR_MSG is null, returns 0, and otherwise causes an error with message ERR_MSG. */ -static struct value* -get_var_value (name, err_msg) - char* name; - char* err_msg; +static struct value * +get_var_value (char *name, char *err_msg) { - struct symbol** syms; - struct block** blocks; + struct symbol **syms; + struct block **blocks; int nsyms; - nsyms = ada_lookup_symbol_list (name, get_selected_block (NULL), VAR_NAMESPACE, - &syms, &blocks); + nsyms = + ada_lookup_symbol_list (name, get_selected_block (NULL), VAR_NAMESPACE, + &syms, &blocks); if (nsyms != 1) { @@ -8109,18 +7838,15 @@ get_var_value (name, err_msg) return value_of_variable (syms[0], blocks[0]); } - + /* Value of integer variable named NAME in the current environment. If no such variable found, then if ERR_MSG is null, returns 0, and sets *FLAG to 0. If successful, sets *FLAG to 1. */ LONGEST -get_int_var_value (name, err_msg, flag) - char* name; - char* err_msg; - int* flag; +get_int_var_value (char *name, char *err_msg, int *flag) { - struct value* var_val = get_var_value (name, err_msg); - + struct value *var_val = get_var_value (name, err_msg); + if (var_val == 0) { if (flag != NULL) @@ -8134,7 +7860,7 @@ get_int_var_value (name, err_msg, flag) return value_as_long (var_val); } } - + /* Return a range type whose base type is that of the range type named NAME in the current environment, and whose bounds are calculated @@ -8144,16 +7870,13 @@ get_int_var_value (name, err_msg, flag) information, in general, is encoded in NAME, the base type given in the named range type. */ -static struct type* -to_fixed_range_type (name, dval, objfile) - char *name; - struct value *dval; - struct objfile *objfile; +static struct type * +to_fixed_range_type (char *name, struct value *dval, struct objfile *objfile) { struct type *raw_type = ada_find_any_type (name); struct type *base_type; LONGEST low, high; - char* subtype_info; + char *subtype_info; if (raw_type == NULL) base_type = builtin_type_int; @@ -8183,62 +7906,60 @@ to_fixed_range_type (name, dval, objfile) bounds_str = strchr (subtype_info, '_'); n = 1; - if (*subtype_info == 'L') + if (*subtype_info == 'L') { - if (! ada_scan_number (bounds_str, n, &L, &n) - && ! scan_discrim_bound (bounds_str, n, dval, &L, &n)) + if (!ada_scan_number (bounds_str, n, &L, &n) + && !scan_discrim_bound (bounds_str, n, dval, &L, &n)) return raw_type; if (bounds_str[n] == '_') n += 2; - else if (bounds_str[n] == '.') /* FIXME? SGI Workshop kludge. */ + else if (bounds_str[n] == '.') /* FIXME? SGI Workshop kludge. */ n += 1; subtype_info += 1; } - else + else { - strcpy (name_buf+prefix_len, "___L"); + strcpy (name_buf + prefix_len, "___L"); L = get_int_var_value (name_buf, "Index bound unknown.", NULL); } - if (*subtype_info == 'U') + if (*subtype_info == 'U') { - if (! ada_scan_number (bounds_str, n, &U, &n) + if (!ada_scan_number (bounds_str, n, &U, &n) && !scan_discrim_bound (bounds_str, n, dval, &U, &n)) return raw_type; } - else + else { - strcpy (name_buf+prefix_len, "___U"); + strcpy (name_buf + prefix_len, "___U"); U = get_int_var_value (name_buf, "Index bound unknown.", NULL); } - if (objfile == NULL) + if (objfile == NULL) objfile = TYPE_OBJFILE (base_type); type = create_range_type (alloc_type (objfile), base_type, L, U); - TYPE_NAME (type) = name; + TYPE_NAME (type) = name; return type; } } /* True iff NAME is the name of a range type. */ int -ada_is_range_type_name (name) - const char* name; +ada_is_range_type_name (const char *name) { return (name != NULL && strstr (name, "___XD")); -} - +} + /* Modular types */ /* True iff TYPE is an Ada modular type. */ int -ada_is_modular_type (type) - struct type* type; +ada_is_modular_type (struct type *type) { /* FIXME: base_type should be declared in gdbtypes.h, implemented in - valarith.c */ - struct type* subranged_type; /* = base_type (type);*/ + valarith.c */ + struct type *subranged_type; /* = base_type (type); */ return (subranged_type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE && TYPE_CODE (subranged_type) != TYPE_CODE_ENUM @@ -8247,105 +7968,99 @@ ada_is_modular_type (type) /* Assuming ada_is_modular_type (TYPE), the modulus of TYPE. */ LONGEST -ada_modulus (type) - struct type* type; +ada_modulus (struct type * type) { - return TYPE_HIGH_BOUND (type) + 1; + return TYPE_HIGH_BOUND (type) + 1; } + - /* Operators */ /* Table mapping opcodes into strings for printing operators and precedences of the operators. */ -static const struct op_print ada_op_print_tab[] = - { - {":=", BINOP_ASSIGN, PREC_ASSIGN, 1}, - {"or else", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0}, - {"and then", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0}, - {"or", BINOP_BITWISE_IOR, PREC_BITWISE_IOR, 0}, - {"xor", BINOP_BITWISE_XOR, PREC_BITWISE_XOR, 0}, - {"and", BINOP_BITWISE_AND, PREC_BITWISE_AND, 0}, - {"=", BINOP_EQUAL, PREC_EQUAL, 0}, - {"/=", BINOP_NOTEQUAL, PREC_EQUAL, 0}, - {"<=", BINOP_LEQ, PREC_ORDER, 0}, - {">=", BINOP_GEQ, PREC_ORDER, 0}, - {">", BINOP_GTR, PREC_ORDER, 0}, - {"<", BINOP_LESS, PREC_ORDER, 0}, - {">>", BINOP_RSH, PREC_SHIFT, 0}, - {"<<", BINOP_LSH, PREC_SHIFT, 0}, - {"+", BINOP_ADD, PREC_ADD, 0}, - {"-", BINOP_SUB, PREC_ADD, 0}, - {"&", BINOP_CONCAT, PREC_ADD, 0}, - {"*", BINOP_MUL, PREC_MUL, 0}, - {"/", BINOP_DIV, PREC_MUL, 0}, - {"rem", BINOP_REM, PREC_MUL, 0}, - {"mod", BINOP_MOD, PREC_MUL, 0}, - {"**", BINOP_EXP, PREC_REPEAT, 0 }, - {"@", BINOP_REPEAT, PREC_REPEAT, 0}, - {"-", UNOP_NEG, PREC_PREFIX, 0}, - {"+", UNOP_PLUS, PREC_PREFIX, 0}, - {"not ", UNOP_LOGICAL_NOT, PREC_PREFIX, 0}, - {"not ", UNOP_COMPLEMENT, PREC_PREFIX, 0}, - {"abs ", UNOP_ABS, PREC_PREFIX, 0}, - {".all", UNOP_IND, PREC_SUFFIX, 1}, /* FIXME: postfix .ALL */ - {"'access", UNOP_ADDR, PREC_SUFFIX, 1}, /* FIXME: postfix 'ACCESS */ - {NULL, 0, 0, 0} +static const struct op_print ada_op_print_tab[] = { + {":=", BINOP_ASSIGN, PREC_ASSIGN, 1}, + {"or else", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0}, + {"and then", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0}, + {"or", BINOP_BITWISE_IOR, PREC_BITWISE_IOR, 0}, + {"xor", BINOP_BITWISE_XOR, PREC_BITWISE_XOR, 0}, + {"and", BINOP_BITWISE_AND, PREC_BITWISE_AND, 0}, + {"=", BINOP_EQUAL, PREC_EQUAL, 0}, + {"/=", BINOP_NOTEQUAL, PREC_EQUAL, 0}, + {"<=", BINOP_LEQ, PREC_ORDER, 0}, + {">=", BINOP_GEQ, PREC_ORDER, 0}, + {">", BINOP_GTR, PREC_ORDER, 0}, + {"<", BINOP_LESS, PREC_ORDER, 0}, + {">>", BINOP_RSH, PREC_SHIFT, 0}, + {"<<", BINOP_LSH, PREC_SHIFT, 0}, + {"+", BINOP_ADD, PREC_ADD, 0}, + {"-", BINOP_SUB, PREC_ADD, 0}, + {"&", BINOP_CONCAT, PREC_ADD, 0}, + {"*", BINOP_MUL, PREC_MUL, 0}, + {"/", BINOP_DIV, PREC_MUL, 0}, + {"rem", BINOP_REM, PREC_MUL, 0}, + {"mod", BINOP_MOD, PREC_MUL, 0}, + {"**", BINOP_EXP, PREC_REPEAT, 0}, + {"@", BINOP_REPEAT, PREC_REPEAT, 0}, + {"-", UNOP_NEG, PREC_PREFIX, 0}, + {"+", UNOP_PLUS, PREC_PREFIX, 0}, + {"not ", UNOP_LOGICAL_NOT, PREC_PREFIX, 0}, + {"not ", UNOP_COMPLEMENT, PREC_PREFIX, 0}, + {"abs ", UNOP_ABS, PREC_PREFIX, 0}, + {".all", UNOP_IND, PREC_SUFFIX, 1}, /* FIXME: postfix .ALL */ + {"'access", UNOP_ADDR, PREC_SUFFIX, 1}, /* FIXME: postfix 'ACCESS */ + {NULL, 0, 0, 0} }; /* Assorted Types and Interfaces */ -struct type* builtin_type_ada_int; -struct type* builtin_type_ada_short; -struct type* builtin_type_ada_long; -struct type* builtin_type_ada_long_long; -struct type* builtin_type_ada_char; -struct type* builtin_type_ada_float; -struct type* builtin_type_ada_double; -struct type* builtin_type_ada_long_double; -struct type* builtin_type_ada_natural; -struct type* builtin_type_ada_positive; -struct type* builtin_type_ada_system_address; - -struct type ** const (ada_builtin_types[]) = -{ - +struct type *builtin_type_ada_int; +struct type *builtin_type_ada_short; +struct type *builtin_type_ada_long; +struct type *builtin_type_ada_long_long; +struct type *builtin_type_ada_char; +struct type *builtin_type_ada_float; +struct type *builtin_type_ada_double; +struct type *builtin_type_ada_long_double; +struct type *builtin_type_ada_natural; +struct type *builtin_type_ada_positive; +struct type *builtin_type_ada_system_address; + +struct type **const (ada_builtin_types[]) = +{ + &builtin_type_ada_int, - &builtin_type_ada_long, - &builtin_type_ada_short, - &builtin_type_ada_char, - &builtin_type_ada_float, - &builtin_type_ada_double, - &builtin_type_ada_long_long, - &builtin_type_ada_long_double, - &builtin_type_ada_natural, - &builtin_type_ada_positive, - - /* The following types are carried over from C for convenience. */ - &builtin_type_int, - &builtin_type_long, - &builtin_type_short, - &builtin_type_char, - &builtin_type_float, - &builtin_type_double, - &builtin_type_long_long, - &builtin_type_void, - &builtin_type_signed_char, - &builtin_type_unsigned_char, - &builtin_type_unsigned_short, - &builtin_type_unsigned_int, - &builtin_type_unsigned_long, - &builtin_type_unsigned_long_long, - &builtin_type_long_double, - &builtin_type_complex, - &builtin_type_double_complex, - 0 -}; + &builtin_type_ada_long, + &builtin_type_ada_short, + &builtin_type_ada_char, + &builtin_type_ada_float, + &builtin_type_ada_double, + &builtin_type_ada_long_long, + &builtin_type_ada_long_double, + &builtin_type_ada_natural, &builtin_type_ada_positive, + /* The following types are carried over from C for convenience. */ +&builtin_type_int, + &builtin_type_long, + &builtin_type_short, + &builtin_type_char, + &builtin_type_float, + &builtin_type_double, + &builtin_type_long_long, + &builtin_type_void, + &builtin_type_signed_char, + &builtin_type_unsigned_char, + &builtin_type_unsigned_short, + &builtin_type_unsigned_int, + &builtin_type_unsigned_long, + &builtin_type_unsigned_long_long, + &builtin_type_long_double, + &builtin_type_complex, &builtin_type_double_complex, 0}; /* Not really used, but needed in the ada_language_defn. */ -static void emit_char (int c, struct ui_file* stream, int quoter) +static void +emit_char (int c, struct ui_file *stream, int quoter) { ada_emit_char (c, stream, quoter, 1); } @@ -8370,16 +8085,16 @@ const struct language_defn ada_language_defn = { ada_print_type, /* Print a type using appropriate syntax */ ada_val_print, /* Print a value using appropriate syntax */ ada_value_print, /* Print a top-level value */ - {"", "", "", ""}, /* Binary format info */ + {"", "", "", ""}, /* Binary format info */ #if 0 - {"8#%lo#", "8#", "o", "#"}, /* Octal format info */ - {"%ld", "", "d", ""}, /* Decimal format info */ - {"16#%lx#", "16#", "x", "#"}, /* Hex format info */ + {"8#%lo#", "8#", "o", "#"}, /* Octal format info */ + {"%ld", "", "d", ""}, /* Decimal format info */ + {"16#%lx#", "16#", "x", "#"}, /* Hex format info */ #else /* Copied from c-lang.c. */ - {"0%lo", "0", "o", ""}, /* Octal format info */ - {"%ld", "", "d", ""}, /* Decimal format info */ - {"0x%lx", "0x", "x", ""}, /* Hex format info */ + {"0%lo", "0", "o", ""}, /* Octal format info */ + {"%ld", "", "d", ""}, /* Decimal format info */ + {"0x%lx", "0x", "x", ""}, /* Hex format info */ #endif ada_op_print_tab, /* expression operators for printing */ 1, /* c-style arrays (FIXME?) */ @@ -8393,59 +8108,48 @@ _initialize_ada_language () { builtin_type_ada_int = init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, - "integer", (struct objfile *) NULL); + 0, "integer", (struct objfile *) NULL); builtin_type_ada_long = init_type (TYPE_CODE_INT, TARGET_LONG_BIT / TARGET_CHAR_BIT, - 0, - "long_integer", (struct objfile *) NULL); + 0, "long_integer", (struct objfile *) NULL); builtin_type_ada_short = init_type (TYPE_CODE_INT, TARGET_SHORT_BIT / TARGET_CHAR_BIT, - 0, - "short_integer", (struct objfile *) NULL); + 0, "short_integer", (struct objfile *) NULL); builtin_type_ada_char = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT, - 0, - "character", (struct objfile *) NULL); + 0, "character", (struct objfile *) NULL); builtin_type_ada_float = init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT, - 0, - "float", (struct objfile *) NULL); + 0, "float", (struct objfile *) NULL); builtin_type_ada_double = init_type (TYPE_CODE_FLT, TARGET_DOUBLE_BIT / TARGET_CHAR_BIT, - 0, - "long_float", (struct objfile *) NULL); + 0, "long_float", (struct objfile *) NULL); builtin_type_ada_long_long = init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, - 0, - "long_long_integer", (struct objfile *) NULL); + 0, "long_long_integer", (struct objfile *) NULL); builtin_type_ada_long_double = init_type (TYPE_CODE_FLT, TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT, - 0, - "long_long_float", (struct objfile *) NULL); + 0, "long_long_float", (struct objfile *) NULL); builtin_type_ada_natural = init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, - "natural", (struct objfile *) NULL); + 0, "natural", (struct objfile *) NULL); builtin_type_ada_positive = init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, - "positive", (struct objfile *) NULL); + 0, "positive", (struct objfile *) NULL); - builtin_type_ada_system_address = - lookup_pointer_type (init_type (TYPE_CODE_VOID, 1, 0, "void", + builtin_type_ada_system_address = + lookup_pointer_type (init_type (TYPE_CODE_VOID, 1, 0, "void", (struct objfile *) NULL)); TYPE_NAME (builtin_type_ada_system_address) = "system__address"; add_language (&ada_language_defn); - add_show_from_set + add_show_from_set (add_set_cmd ("varsize-limit", class_support, var_uinteger, - (char*) &varsize_limit, + (char *) &varsize_limit, "Set maximum bytes in dynamic-sized object.", - &setlist), - &showlist); + &setlist), &showlist); varsize_limit = 65536; add_com ("begin", class_breakpoint, begin_command, @@ -8479,140 +8183,135 @@ the \"run\" command (q.v.)."); debugging information supplied by the compiler. fnf@cygnus.com */ static struct type * -ada_create_fundamental_type (objfile, typeid) - struct objfile *objfile; - int typeid; +ada_create_fundamental_type (struct objfile *objfile, int typeid) { struct type *type = NULL; switch (typeid) { - default: - /* FIXME: For now, if we are asked to produce a type not in this - language, create the equivalent of a C integer type with the - name "<?type?>". When all the dust settles from the type - reconstruction work, this should probably become an error. */ - type = init_type (TYPE_CODE_INT, - TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, "<?type?>", objfile); - warning ("internal error: no Ada fundamental type %d", typeid); - break; - case FT_VOID: - type = init_type (TYPE_CODE_VOID, - TARGET_CHAR_BIT / TARGET_CHAR_BIT, - 0, "void", objfile); - break; - case FT_CHAR: - type = init_type (TYPE_CODE_INT, - TARGET_CHAR_BIT / TARGET_CHAR_BIT, - 0, "character", objfile); - break; - case FT_SIGNED_CHAR: - type = init_type (TYPE_CODE_INT, - TARGET_CHAR_BIT / TARGET_CHAR_BIT, - 0, "signed char", objfile); - break; - case FT_UNSIGNED_CHAR: - type = init_type (TYPE_CODE_INT, - TARGET_CHAR_BIT / TARGET_CHAR_BIT, - TYPE_FLAG_UNSIGNED, "unsigned char", objfile); - break; - case FT_SHORT: - type = init_type (TYPE_CODE_INT, - TARGET_SHORT_BIT / TARGET_CHAR_BIT, - 0, "short_integer", objfile); - break; - case FT_SIGNED_SHORT: - type = init_type (TYPE_CODE_INT, - TARGET_SHORT_BIT / TARGET_CHAR_BIT, - 0, "short_integer", objfile); - break; - case FT_UNSIGNED_SHORT: - type = init_type (TYPE_CODE_INT, - TARGET_SHORT_BIT / TARGET_CHAR_BIT, - TYPE_FLAG_UNSIGNED, "unsigned short", objfile); - break; - case FT_INTEGER: - type = init_type (TYPE_CODE_INT, - TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, "integer", objfile); - break; - case FT_SIGNED_INTEGER: - type = init_type (TYPE_CODE_INT, - TARGET_INT_BIT / TARGET_CHAR_BIT, - 0, "integer", objfile); /* FIXME -fnf */ - break; - case FT_UNSIGNED_INTEGER: - type = init_type (TYPE_CODE_INT, - TARGET_INT_BIT / TARGET_CHAR_BIT, - TYPE_FLAG_UNSIGNED, "unsigned int", objfile); - break; - case FT_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_BIT / TARGET_CHAR_BIT, - 0, "long_integer", objfile); - break; - case FT_SIGNED_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_BIT / TARGET_CHAR_BIT, - 0, "long_integer", objfile); - break; - case FT_UNSIGNED_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_BIT / TARGET_CHAR_BIT, - TYPE_FLAG_UNSIGNED, "unsigned long", objfile); - break; - case FT_LONG_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, - 0, "long_long_integer", objfile); - break; - case FT_SIGNED_LONG_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, - 0, "long_long_integer", objfile); - break; - case FT_UNSIGNED_LONG_LONG: - type = init_type (TYPE_CODE_INT, - TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, - TYPE_FLAG_UNSIGNED, "unsigned long long", objfile); - break; - case FT_FLOAT: - type = init_type (TYPE_CODE_FLT, - TARGET_FLOAT_BIT / TARGET_CHAR_BIT, - 0, "float", objfile); - break; - case FT_DBL_PREC_FLOAT: - type = init_type (TYPE_CODE_FLT, - TARGET_DOUBLE_BIT / TARGET_CHAR_BIT, - 0, "long_float", objfile); - break; - case FT_EXT_PREC_FLOAT: - type = init_type (TYPE_CODE_FLT, - TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT, - 0, "long_long_float", objfile); - break; - } + default: + /* FIXME: For now, if we are asked to produce a type not in this + language, create the equivalent of a C integer type with the + name "<?type?>". When all the dust settles from the type + reconstruction work, this should probably become an error. */ + type = init_type (TYPE_CODE_INT, + TARGET_INT_BIT / TARGET_CHAR_BIT, + 0, "<?type?>", objfile); + warning ("internal error: no Ada fundamental type %d", typeid); + break; + case FT_VOID: + type = init_type (TYPE_CODE_VOID, + TARGET_CHAR_BIT / TARGET_CHAR_BIT, + 0, "void", objfile); + break; + case FT_CHAR: + type = init_type (TYPE_CODE_INT, + TARGET_CHAR_BIT / TARGET_CHAR_BIT, + 0, "character", objfile); + break; + case FT_SIGNED_CHAR: + type = init_type (TYPE_CODE_INT, + TARGET_CHAR_BIT / TARGET_CHAR_BIT, + 0, "signed char", objfile); + break; + case FT_UNSIGNED_CHAR: + type = init_type (TYPE_CODE_INT, + TARGET_CHAR_BIT / TARGET_CHAR_BIT, + TYPE_FLAG_UNSIGNED, "unsigned char", objfile); + break; + case FT_SHORT: + type = init_type (TYPE_CODE_INT, + TARGET_SHORT_BIT / TARGET_CHAR_BIT, + 0, "short_integer", objfile); + break; + case FT_SIGNED_SHORT: + type = init_type (TYPE_CODE_INT, + TARGET_SHORT_BIT / TARGET_CHAR_BIT, + 0, "short_integer", objfile); + break; + case FT_UNSIGNED_SHORT: + type = init_type (TYPE_CODE_INT, + TARGET_SHORT_BIT / TARGET_CHAR_BIT, + TYPE_FLAG_UNSIGNED, "unsigned short", objfile); + break; + case FT_INTEGER: + type = init_type (TYPE_CODE_INT, + TARGET_INT_BIT / TARGET_CHAR_BIT, + 0, "integer", objfile); + break; + case FT_SIGNED_INTEGER: + type = init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, 0, "integer", objfile); /* FIXME -fnf */ + break; + case FT_UNSIGNED_INTEGER: + type = init_type (TYPE_CODE_INT, + TARGET_INT_BIT / TARGET_CHAR_BIT, + TYPE_FLAG_UNSIGNED, "unsigned int", objfile); + break; + case FT_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_BIT / TARGET_CHAR_BIT, + 0, "long_integer", objfile); + break; + case FT_SIGNED_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_BIT / TARGET_CHAR_BIT, + 0, "long_integer", objfile); + break; + case FT_UNSIGNED_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_BIT / TARGET_CHAR_BIT, + TYPE_FLAG_UNSIGNED, "unsigned long", objfile); + break; + case FT_LONG_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, + 0, "long_long_integer", objfile); + break; + case FT_SIGNED_LONG_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, + 0, "long_long_integer", objfile); + break; + case FT_UNSIGNED_LONG_LONG: + type = init_type (TYPE_CODE_INT, + TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, + TYPE_FLAG_UNSIGNED, "unsigned long long", objfile); + break; + case FT_FLOAT: + type = init_type (TYPE_CODE_FLT, + TARGET_FLOAT_BIT / TARGET_CHAR_BIT, + 0, "float", objfile); + break; + case FT_DBL_PREC_FLOAT: + type = init_type (TYPE_CODE_FLT, + TARGET_DOUBLE_BIT / TARGET_CHAR_BIT, + 0, "long_float", objfile); + break; + case FT_EXT_PREC_FLOAT: + type = init_type (TYPE_CODE_FLT, + TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT, + 0, "long_long_float", objfile); + break; + } return (type); } -void ada_dump_symtab (struct symtab* s) +void +ada_dump_symtab (struct symtab *s) { int i; fprintf (stderr, "New symtab: [\n"); - fprintf (stderr, " Name: %s/%s;\n", - s->dirname ? s->dirname : "?", - s->filename ? s->filename : "?"); + fprintf (stderr, " Name: %s/%s;\n", + s->dirname ? s->dirname : "?", s->filename ? s->filename : "?"); fprintf (stderr, " Format: %s;\n", s->debugformat); if (s->linetable != NULL) { fprintf (stderr, " Line table (section %d):\n", s->block_line_section); for (i = 0; i < s->linetable->nitems; i += 1) { - struct linetable_entry* e = s->linetable->item + i; + struct linetable_entry *e = s->linetable->item + i; fprintf (stderr, " %4ld: %8lx\n", (long) e->line, (long) e->pc); } } fprintf (stderr, "]\n"); } - |