diff options
| author | Aidan Skinner <aidan@velvet.net> | 2002-08-18 18:11:12 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@velvet.net> | 2002-08-18 18:11:12 +0000 |
| commit | 3686df2a5d0165eb2c93d5eb079ab9f9e89963c2 (patch) | |
| tree | 7492b9df2cf567d17000c250b8c78ef92a22c343 | |
| parent | 9d768be39817076465efe3decfb8c05ae297791a (diff) | |
| download | gdb-3686df2a5d0165eb2c93d5eb079ab9f9e89963c2.tar.gz | |
* ada-lang.c: run through gdb_indent.sh
* ada-lang.h: run through gdb_indent.sh
* ada-tasks.c: run through gdb_indent.sh
* ada-typeprint.c: run through gdb_indent.sh
* ada-valprint.c: run through gdb_indent.sh
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 5292 | ||||
| -rw-r--r-- | gdb/ada-lang.h | 255 | ||||
| -rw-r--r-- | gdb/ada-tasks.c | 312 | ||||
| -rw-r--r-- | gdb/ada-typeprint.c | 380 | ||||
| -rw-r--r-- | gdb/ada-valprint.c | 285 |
6 files changed, 3322 insertions, 3210 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0c3f636e2e8..604ea3d4c01 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2002-08-18 Aidan Skinner <aidan@velvet.net> + + * ada-lang.c: run through gdb_indent.sh + * ada-lang.h: run through gdb_indent.sh + * ada-tasks.c: run through gdb_indent.sh + * ada-typeprint.c: run through gdb_indent.sh + * ada-valprint.c: run through gdb_indent.sh + 2002-08-18 Andrew Cagney <ac131313@redhat.com> * osabi.c (gdbarch_init_osabi): Don't complain about an unknown diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 97fe9e3e873..6505ea6a3e2 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -40,150 +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 */ @@ -199,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 @@ -218,14 +232,15 @@ extract_string (CORE_ADDR addr, char *buf) updating *OLD_VECT and *SIZE as necessary. */ void -grow_vect (void** old_vect, size_t* size, size_t min_size, int 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); - } + 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 @@ -235,24 +250,24 @@ static int 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 (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 @@ -262,7 +277,7 @@ ada_name_prefix_len (const char* 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) @@ -275,11 +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 (struct type* type, char* valaddr, CORE_ADDR address) +struct value * +value_from_contents_and_address (struct type *type, char *valaddr, + CORE_ADDR address) { - struct value* v = allocate_value (type); - if (valaddr == NULL) + struct value *v = allocate_value (type); + if (valaddr == NULL) VALUE_LAZY (v) = 1; else memcpy (VALUE_CONTENTS_RAW (v), valaddr, TYPE_LENGTH (type)); @@ -292,24 +308,25 @@ value_from_contents_and_address (struct type* type, char* valaddr, CORE_ADDR add /* 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 (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; } @@ -317,8 +334,8 @@ coerce_unspec_val_to_type (struct value* val, long offset, struct type *type) } } -static char* -cond_offset_host (char* valaddr, long offset) +static char * +cond_offset_host (char *valaddr, long offset) { if (valaddr == NULL) return NULL; @@ -331,29 +348,29 @@ 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; @@ -361,62 +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 (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 (const char* str) +is_suppressed_name (const char *str) { if (STREQN (str, "_ada_", 5)) str += 5; @@ -424,13 +441,13 @@ is_suppressed_name (const char* 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; @@ -439,11 +456,11 @@ is_suppressed_name (const char* 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; } @@ -452,42 +469,43 @@ is_suppressed_name (const char* str) /* The "mangled" form of DEMANGLED, according to GNAT conventions. * The result is valid until the next call to ada_mangle. */ char * -ada_mangle (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; @@ -501,19 +519,19 @@ ada_mangle (const char* 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 { @@ -539,16 +557,16 @@ ada_fold_name (const char* name) */ char * -ada_demangle (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; @@ -558,7 +576,7 @@ ada_demangle (const char* mangled) p = strstr (mangled, "___"); if (p == NULL) len0 = strlen (mangled); - else + else { if (p[3] == 'X') len0 = p - mangled; @@ -571,19 +589,20 @@ ada_demangle (const char* 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; @@ -594,9 +613,10 @@ ada_demangle (const char* 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; @@ -610,9 +630,9 @@ ada_demangle (const char* 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; @@ -620,16 +640,18 @@ ada_demangle (const char* 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'; @@ -641,8 +663,7 @@ ada_demangle (const char* 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); @@ -660,20 +681,21 @@ Suppress: * either argument is NULL. */ int -ada_match_name (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 @@ -684,18 +706,18 @@ 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" }; @@ -708,9 +730,8 @@ static char* bound_name[] = { static void 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); } @@ -719,8 +740,8 @@ modify_general_field (char *addr, LONGEST fieldval, int bitpos, int bitsize) /* The descriptor or array type, if any, indicated by TYPE; removes level of indirection, if needed. */ -static struct type* -desc_base_type (struct type* type) +static struct type * +desc_base_type (struct type *type) { if (type == NULL) return NULL; @@ -733,26 +754,25 @@ desc_base_type (struct 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 @@ -761,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 @@ -784,10 +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 (struct type* type) +static struct type * +desc_bounds_type (struct type *type) { - struct type* r; + struct type *r; type = desc_base_type (type); @@ -813,33 +833,34 @@ desc_bounds_type (struct 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 (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; @@ -848,7 +869,7 @@ desc_bounds (struct value* 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 (struct type* type) +fat_pntr_bounds_bitpos (struct type *type) { return TYPE_FIELD_BITPOS (desc_base_type (type), 1); } @@ -856,11 +877,11 @@ fat_pntr_bounds_bitpos (struct type* 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 (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))); @@ -870,15 +891,15 @@ fat_pntr_bounds_bitsize (struct type* 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 (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 @@ -887,14 +908,14 @@ desc_data_type (struct type* type) /* If ARR is an array descriptor (fat or thin pointer), a pointer to its array data. */ -static struct value* -desc_data (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; @@ -904,7 +925,7 @@ desc_data (struct value* 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 (struct type* type) +fat_pntr_data_bitpos (struct type *type) { return TYPE_FIELD_BITPOS (desc_base_type (type), 0); } @@ -912,23 +933,23 @@ fat_pntr_data_bitpos (struct type* 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 (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 (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"); } @@ -936,42 +957,42 @@ desc_one_bound (struct value* bounds, int i, int 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 (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 (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 (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 (struct type* type) +desc_arity (struct type *type) { type = desc_base_type (type); @@ -983,7 +1004,7 @@ desc_arity (struct type* type) /* Non-zero iff type is a simple array type (or pointer to one). */ int -ada_is_simple_array (struct type* type) +ada_is_simple_array (struct type *type) { if (type == NULL) return 0; @@ -995,19 +1016,19 @@ ada_is_simple_array (struct type* type) /* Non-zero iff type belongs to a GNAT array descriptor. */ int -ada_is_array_descriptor (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; } @@ -1019,12 +1040,12 @@ ada_is_array_descriptor (struct type* type) int 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); } @@ -1035,45 +1056,47 @@ ada_is_bogus_array_descriptor (struct type *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 (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); } @@ -1083,12 +1106,12 @@ ada_type_of_array (struct value* arr, int 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 (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))); @@ -1102,31 +1125,31 @@ ada_coerce_to_simple_array_ptr (struct value* 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 (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 (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); @@ -1135,12 +1158,12 @@ ada_coerce_to_simple_array_type (struct type*type) /* Non-zero iff TYPE represents a standard GNAT packed-array type. */ int -ada_is_packed_array_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; } @@ -1153,11 +1176,11 @@ ada_is_packed_array_type (struct 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 (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); @@ -1171,15 +1194,15 @@ packed_array_type (struct type* type, long* 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; } @@ -1190,15 +1213,15 @@ packed_array_type (struct type* type, long* elt_bits) /* The array type encoded by TYPE, where ada_is_packed_array_type (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; +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; @@ -1207,7 +1230,7 @@ decode_packed_array_type (struct 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 @@ -1225,13 +1248,13 @@ decode_packed_array_type (struct 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); } @@ -1241,10 +1264,10 @@ decode_packed_array_type (struct 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 (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) { @@ -1259,36 +1282,36 @@ decode_packed_array (struct value* 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 (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); @@ -1299,8 +1322,8 @@ value_subscript_packed (struct value* arr, int arity, struct value** 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; @@ -1312,18 +1335,19 @@ value_subscript_packed (struct value* arr, int arity, struct value** ind) /* Non-zero iff TYPE includes negative integer values. */ static int -has_negatives (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, @@ -1334,26 +1358,26 @@ has_negatives (struct type* type) in this case is never an lval. Assumes 0 <= BIT_OFFSET < HOST_CHAR_BIT. */ -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 * +ada_value_primitive_packed_val (struct value *obj, char *valaddr, long offset, + int bit_offset, int bit_size, + struct type *type) { - struct value* v; + 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); @@ -1361,22 +1385,22 @@ ada_value_primitive_packed_val (struct value* obj, char* valaddr, long offset, i 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) @@ -1385,14 +1409,14 @@ ada_value_primitive_packed_val (struct value* obj, char* valaddr, long offset, i 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; @@ -1405,34 +1429,34 @@ ada_value_primitive_packed_val (struct value* obj, char* valaddr, long offset, i } 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; @@ -1440,23 +1464,24 @@ ada_value_primitive_packed_val (struct value* obj, char* valaddr, long offset, i 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; @@ -1481,12 +1506,12 @@ ada_value_primitive_packed_val (struct value* obj, char* valaddr, long offset, i 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; @@ -1495,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; @@ -1512,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; @@ -1527,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; @@ -1536,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; @@ -1553,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) @@ -1564,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; } @@ -1605,24 +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 (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; @@ -1632,22 +1656,23 @@ ada_value_subscript (struct value* arr, int arity, struct value** 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 (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)); @@ -1664,7 +1689,7 @@ ada_value_ptr_subscript (struct value* arr, struct type* type, int arity, struct type designation. Otherwise, returns 0. */ int -ada_array_arity (struct type* type) +ada_array_arity (struct type *type) { int arity; @@ -1674,15 +1699,15 @@ ada_array_arity (struct type* 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; } @@ -1691,27 +1716,27 @@ ada_array_arity (struct type* type) TYPE after indexing by NINDICES indices, or by all indices if NINDICES is -1. Otherwise, returns NULL. */ -struct type* -ada_array_element_type (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; @@ -1734,8 +1759,8 @@ ada_array_element_type (struct type* type, int nindices) /* The type of nth index in arrays of given type (n numbering from 1). Does not examine memory. */ -struct type* -ada_index_type (struct type* type, int n) +struct type * +ada_index_type (struct type *type, int n) { type = desc_base_type (type); @@ -1751,7 +1776,7 @@ ada_index_type (struct type* type, int n) return TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)); } - else + else return desc_index_type (desc_bounds_type (type), n); } @@ -1763,19 +1788,20 @@ ada_index_type (struct type* type, int n) run-time quantities other than discriminants. */ LONGEST -ada_array_bound_from_type (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) @@ -1784,12 +1810,12 @@ ada_array_bound_from_type (struct type* arr_type, int n, int which, struct type* 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; @@ -1798,23 +1824,23 @@ ada_array_bound_from_type (struct type* arr_type, int n, int which, struct type* 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)); } @@ -1825,19 +1851,19 @@ ada_array_bound_from_type (struct type* arr_type, int n, int which, struct type* 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); } @@ -1849,42 +1875,41 @@ 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 (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* +static const char * ada_op_name (enum exp_opcode op) { int i; @@ -1909,7 +1934,7 @@ ada_op_name (enum exp_opcode op) May change (expand) *EXP. */ void -ada_resolve (struct expression** expp, struct type* context_type) +ada_resolve (struct expression **expp, struct type *context_type) { int pc; pc = 0; @@ -1924,14 +1949,15 @@ ada_resolve (struct expression** expp, struct type* 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 (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; @@ -1942,7 +1968,7 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc 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; @@ -1950,43 +1976,43 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc 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; @@ -1996,7 +2022,7 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc case BINOP_ASSIGN: { - struct value* arg1; + struct value *arg1; nargs = 2; *pos += 1; arg1 = ada_resolve_subexp (expp, pos, 0, NULL); @@ -2008,16 +2034,16 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc } 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: @@ -2081,29 +2107,30 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc 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; @@ -2119,97 +2146,98 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc /* 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; @@ -2217,37 +2245,37 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc 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: @@ -2273,18 +2301,18 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc 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; @@ -2301,14 +2329,14 @@ ada_resolve_subexp (struct expression** expp, int *pos, int deprocedure_p, struc /* 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); @@ -2319,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; @@ -2331,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: @@ -2347,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: @@ -2370,12 +2399,12 @@ ada_type_match (ftype, atype, may_deref) argument function. */ static int -ada_args_match (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) @@ -2386,11 +2415,11 @@ ada_args_match (struct symbol* func, struct value** actuals, int 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; @@ -2402,23 +2431,23 @@ ada_args_match (struct symbol* func, struct value** actuals, int n_actuals) or an enumerated type. A null CONTEXT_TYPE indicates any non-void type. */ static int -return_match (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; @@ -2441,14 +2470,14 @@ return_match (struct type* func_type, struct type* context_type) is modified in parallel to SYMS. */ int -ada_resolve_function (struct symbol* syms[], struct block* blocks[], int nsyms, - struct value** args, int 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) @@ -2456,12 +2485,12 @@ ada_resolve_function (struct symbol* syms[], struct block* blocks[], int nsyms, 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)) @@ -2495,7 +2524,7 @@ ada_resolve_function (struct symbol* syms[], struct block* blocks[], int nsyms, /* 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; @@ -2504,50 +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 (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; } } @@ -2562,11 +2591,11 @@ sort_choices (struct symbol* syms[], struct block* blocks[], int nsyms) to be re-integrated one of these days. */ int -user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, +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; @@ -2575,9 +2604,9 @@ user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, 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); @@ -2590,30 +2619,27 @@ user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, { 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); @@ -2621,7 +2647,7 @@ user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, 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, @@ -2631,17 +2657,18 @@ user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, 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]]; } @@ -2665,15 +2692,15 @@ user_select_syms (struct symbol* syms[], struct block* blocks[], int nsyms, prompts (for use with the -f switch). */ int -get_selections (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 = ">"; @@ -2682,7 +2709,7 @@ get_selections (int* choices, int n_choices, int max_results, gdb_flush (gdb_stdout); args = command_line_input ((char *) NULL, 0, annotation_suffix); - + if (args == NULL) error_no_arg ("one or more choice numbers"); @@ -2692,7 +2719,7 @@ get_selections (int* choices, int n_choices, int max_results, order, as given in args. Choices are validated. */ while (1) { - char* args2; + char *args2; int choice, j; while (isspace (*args)) @@ -2703,11 +2730,12 @@ get_selections (int* choices, int n_choices, int max_results, 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) @@ -2719,22 +2747,23 @@ get_selections (int* choices, int n_choices, int max_results, } 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; } @@ -2743,21 +2772,21 @@ get_selections (int* choices, int n_choices, int max_results, /* arguments. Update *EXPP as needed to hold more space. */ static void -replace_operator_with_call (struct expression** expp, int pc, int nargs, - int 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; @@ -2769,7 +2798,7 @@ replace_operator_with_call (struct expression** expp, int pc, int nargs, *expp = newexp; xfree (exp); -} +} /* Type-class predicates */ @@ -2777,85 +2806,89 @@ replace_operator_with_call (struct expression** expp, int pc, int nargs, /* FLOAT.) */ static int -numeric_type_p (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 (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 (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 (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 @@ -2863,12 +2896,12 @@ discrete_type_p (struct type* type) (i.e., result 0). */ static int -possible_user_operator_p (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: @@ -2878,14 +2911,14 @@ possible_user_operator_p (enum exp_opcode op, struct value* 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: @@ -2893,26 +2926,25 @@ possible_user_operator_p (enum exp_opcode op, struct value* 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)); } } @@ -2927,15 +2959,15 @@ possible_user_operator_p (enum exp_opcode op, struct value* 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 (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; @@ -2946,23 +2978,23 @@ ada_renaming_type (struct type* type) /* Return non-zero iff SYM encodes an object renaming. */ int -ada_is_object_renaming (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 (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) @@ -2974,29 +3006,30 @@ ada_simple_renamed_entity (struct symbol* 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 (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 @@ -3012,19 +3045,20 @@ place_on_stack (struct value* val, CORE_ADDR* 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. */ + values not residing in memory, updating it as needed. */ -static struct value* -convert_actual (struct value* actual, struct type* formal_type0, CORE_ADDR* sp) +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; + 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) @@ -3032,17 +3066,17 @@ convert_actual (struct value* actual, struct type* formal_type0, CORE_ADDR* 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); } @@ -3062,30 +3096,30 @@ convert_actual (struct value* actual, struct type* formal_type0, CORE_ADDR* sp) to-descriptor type rather than a descriptor type), a struct value* representing a pointer to this descriptor. */ -static struct value* -make_array_descriptor (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), @@ -3113,22 +3147,21 @@ make_array_descriptor (struct type* type, struct value* arr, CORE_ADDR* sp) value as needed. */ void -ada_convert_actuals (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 */ @@ -3136,32 +3169,32 @@ ada_convert_actuals (struct value* func, int nargs, struct value* args[], CORE_A /* 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 (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 (struct symbol* syms[], int n) +is_nonfunction (struct symbol *syms[], int n) { int i; @@ -3177,19 +3210,19 @@ is_nonfunction (struct symbol* syms[], int n) struct types. Otherwise, they may not. */ static int -equiv_types (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; } @@ -3197,7 +3230,7 @@ equiv_types (struct type* type0, struct type* type1) no more defined than that of SYM1. */ static int -lesseq_defined_than (struct symbol* sym0, struct symbol* sym1) +lesseq_defined_than (struct symbol *sym0, struct symbol *sym1) { if (sym0 == sym1) return 1; @@ -3205,18 +3238,18 @@ lesseq_defined_than (struct symbol* sym0, struct symbol* 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) @@ -3225,8 +3258,8 @@ lesseq_defined_than (struct symbol* sym0, struct symbol* 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; } } @@ -3235,12 +3268,12 @@ lesseq_defined_than (struct symbol* sym0, struct symbol* sym1) defn_blocks as needed. Do not include SYM if it is a duplicate. */ static void -add_defn_to_vec (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) { @@ -3255,8 +3288,8 @@ add_defn_to_vec (struct symbol* sym, struct block* 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; @@ -3268,7 +3301,8 @@ add_defn_to_vec (struct symbol* sym, struct block* block) wild-card match if WILD. */ static struct partial_symbol * -ada_lookup_partial_symbol (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); @@ -3279,16 +3313,16 @@ ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, int glo { 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))) @@ -3296,22 +3330,23 @@ ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, int glo } 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; } @@ -3326,14 +3361,14 @@ ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, int glo 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; @@ -3342,17 +3377,18 @@ ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, int glo 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; } @@ -3362,114 +3398,111 @@ ada_lookup_partial_symbol (struct partial_symtab *pst, const char *name, int glo 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 (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); - 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) + { + 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); - ALL_BLOCK_SYMBOLS (b, i, tmp_sym) - if (sym == tmp_sym) - 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 (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; } @@ -3484,15 +3517,16 @@ ada_lookup_minimal_symbol (const char* 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 (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) { @@ -3504,15 +3538,15 @@ add_symbols_from_enclosing_procs (const char* name, namespace_enum namespace, in 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) @@ -3520,10 +3554,12 @@ add_symbols_from_enclosing_procs (const char* name, namespace_enum namespace, in 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; @@ -3532,7 +3568,7 @@ add_symbols_from_enclosing_procs (const char* name, namespace_enum namespace, in while (block != NULL && block_function (block) != NULL && ndefns == 0) { ada_add_block_symbols (block, name, namespace, NULL, wild_match); - + block = BLOCK_SUPERBLOCK (block); } } @@ -3544,9 +3580,9 @@ add_symbols_from_enclosing_procs (const char* name, namespace_enum namespace, in /* 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 (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>")); } @@ -3559,30 +3595,31 @@ is_nondebugging_type (struct type* type) * correspondence between SYMS[i] and BLOCKS[i]. Returns the number * of symbols in the modified list. */ static int -remove_extra_symbols (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; @@ -3609,8 +3646,8 @@ remove_extra_symbols (struct symbol** syms, struct block** blocks, int nsyms) int ada_lookup_symbol_list (const char *name, struct block *block0, - namespace_enum namespace, struct symbol*** syms, - struct block*** blocks) + namespace_enum namespace, struct symbol ***syms, + struct block ***blocks) { struct symbol *sym; struct symtab *s; @@ -3648,117 +3685,117 @@ ada_lookup_symbol_list (const char *name, struct block *block0, 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); @@ -3776,11 +3813,12 @@ ada_lookup_symbol_list (const char *name, struct block *block0, * Otherwise, the result is as for ada_lookup_symbol_list, but is * disambiguated by user query if needed. */ -struct symbol* -ada_lookup_symbol (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, @@ -3804,28 +3842,28 @@ ada_lookup_symbol (const char *name, struct block *block0, namespace_enum namesp * */ static int -is_name_suffix (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; @@ -3850,45 +3888,49 @@ is_name_suffix (const char* 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 (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; } } @@ -3902,9 +3944,9 @@ wild_match (const char* patn, int patn_len, const char* 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 (struct block* block, const char* name, - namespace_enum namespace, struct objfile* objfile, +static void +ada_add_block_symbols (struct block *block, const char *name, + namespace_enum namespace, struct objfile *objfile, int wild) { int i; @@ -3916,52 +3958,54 @@ ada_add_block_symbols (struct block* block, const char* name, int is_sorted = BLOCK_SHOULD_SORT (block); struct symbol *sym; - arg_sym = NULL; found_sym = 0; + arg_sym = NULL; + found_sym = 0; if (wild) { 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; - } - } - } + { + 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; } @@ -3976,7 +4020,7 @@ ada_add_block_symbols (struct block* block, const char* name, { int cmp = strncmp (name, SYMBOL_NAME (sym), name_len); - if (cmp < 0) + if (cmp < 0) { if (is_sorted) { @@ -3984,8 +4028,8 @@ ada_add_block_symbols (struct block* block, const char* name, break; } } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (sym) + name_len)) + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (sym) + name_len)) { switch (SYMBOL_CLASS (sym)) { @@ -4011,29 +4055,31 @@ ada_add_block_symbols (struct block* block, const char* name, } } - 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; } @@ -4051,14 +4097,14 @@ ada_add_block_symbols (struct block* block, const char* name, int cmp; cmp = (int) '_' - (int) SYMBOL_NAME (sym)[0]; - if (cmp == 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 (cmp < 0) { if (is_sorted) { @@ -4066,8 +4112,8 @@ ada_add_block_symbols (struct block* block, const char* name, break; } } - else if (cmp == 0 - && is_name_suffix (SYMBOL_NAME (sym) + name_len + 5)) + else if (cmp == 0 + && is_name_suffix (SYMBOL_NAME (sym) + name_len + 5)) { switch (SYMBOL_CLASS (sym)) { @@ -4091,31 +4137,31 @@ ada_add_block_symbols (struct block* block, const char* name, } } } - + /* 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 (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; @@ -4136,42 +4182,42 @@ fill_in_ada_prototype (struct symbol* func) b = SYMBOL_BLOCK_VALUE (func); nargs = 0; - max_fields = 8; - TYPE_FIELDS (ftype) = - (struct field*) xmalloc (sizeof (struct field) * max_fields); + 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); - - 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; + { + GROW_VECT (TYPE_FIELDS (ftype), max_fields, 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; + 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; - default: - break; - } - } + 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 */ @@ -4180,37 +4226,37 @@ fill_in_ada_prototype (struct symbol* func) TYPE_NFIELDS (ftype) = nargs; if (nargs == 0) { - static struct field dummy_field = {0, 0, 0, 0}; + 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)); + 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 (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; @@ -4260,20 +4306,20 @@ ada_start_decode_line_1 (char* line) is the caller's responsibility to free them. */ struct symtabs_and_lines -ada_finish_decode_line_1 (char** spec, struct symtab* file_table, - int funfirstline, char*** canonical) +ada_finish_decode_line_1 (char **spec, struct symtab *file_table, + int funfirstline, char ***canonical) { - struct symbol** symbols; - struct block** blocks; - struct block* block; + 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); @@ -4281,15 +4327,15 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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; @@ -4298,11 +4344,11 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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."); @@ -4318,28 +4364,28 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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); @@ -4349,22 +4395,22 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, /* 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) { @@ -4376,28 +4422,29 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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 (xfree, selected.sals); @@ -4405,9 +4452,9 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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]); @@ -4415,87 +4462,89 @@ ada_finish_decode_line_1 (char** spec, struct symtab* file_table, 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 (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; @@ -4507,8 +4556,8 @@ find_sal_from_funcs_and_line (const char* filename, int line_num, 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 (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; @@ -4519,7 +4568,7 @@ find_line_in_linetable (struct linetable* linetable, int line_num, 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) { @@ -4553,7 +4602,7 @@ find_line_in_linetable (struct linetable* linetable, int line_num, 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 (struct linetable* linetable, int line_num) +nearest_line_number_in_linetable (struct linetable *linetable, int line_num) { int i, len, best; @@ -4561,15 +4610,16 @@ nearest_line_number_in_linetable (struct linetable* linetable, int 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; @@ -4579,9 +4629,9 @@ nearest_line_number_in_linetable (struct linetable* linetable, int 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; @@ -4612,7 +4662,7 @@ nearest_line_number_in_linetable (struct linetable* linetable, int line_num) IND == -1 corresponds to no function. */ static int -find_next_line_in_linetable (struct linetable* linetable, int line_num, +find_next_line_in_linetable (struct linetable *linetable, int line_num, int starting_line, int ind) { int i, len; @@ -4621,12 +4671,12 @@ find_next_line_in_linetable (struct linetable* linetable, int line_num, 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; @@ -4641,11 +4691,11 @@ find_next_line_in_linetable (struct linetable* linetable, int line_num, 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; @@ -4655,13 +4705,13 @@ find_next_line_in_linetable (struct linetable* linetable, int line_num, { 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; } } @@ -4676,7 +4726,7 @@ find_next_line_in_linetable (struct linetable* linetable, int line_num, /* True iff function symbol SYM starts somewhere at or before line # LINE_NUM. */ static int -is_plausible_func_for_line (struct symbol* sym, int line_num) +is_plausible_func_for_line (struct symbol *sym, int line_num) { struct symtab_and_line start_sal; @@ -4689,11 +4739,11 @@ is_plausible_func_for_line (struct symbol* sym, int line_num) } static void -debug_print_lines (struct linetable* lt) +debug_print_lines (struct linetable *lt) { int i; - if (lt == NULL) + if (lt == NULL) return; fprintf (stderr, "\t"); @@ -4703,150 +4753,152 @@ debug_print_lines (struct linetable* lt) } static void -debug_print_block (struct block* b) +debug_print_block (struct block *b) { int i; 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, "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:"); ALL_BLOCK_SYMBOLS (b, i, sym) - { - if (i > 0 && i % 4 == 0) - fprintf (stderr, "\n\t\t "); - fprintf (stderr, " %s", SYMBOL_NAME (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 (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 (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 (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 (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]]; @@ -4854,13 +4906,13 @@ all_sals_for_line (const char* filename, int line_num, char*** canonical) result.nelts = n; } - if (canonical != NULL) + if (canonical != NULL) { - *canonical = (char**) xmalloc (result.nelts * sizeof (char**)); + *canonical = (char **) xmalloc (result.nelts * sizeof (char **)); make_cleanup (xfree, *canonical); - for (k = 0; k < result.nelts; k += 1) + 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."); @@ -4879,17 +4931,16 @@ all_sals_for_line (const char* filename, int line_num, char*** canonical) information. The caller is responsible for releasing any space allocated. */ -static char* -extended_canonical_line_spec (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; } @@ -4899,8 +4950,8 @@ 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; } @@ -4911,58 +4962,58 @@ 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); } @@ -4972,8 +5023,7 @@ 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 @@ -4983,29 +5033,29 @@ int 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; @@ -5021,58 +5071,57 @@ 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 @@ -5083,69 +5132,70 @@ 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 (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); - } - */ + && 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 @@ -5156,11 +5206,11 @@ 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))); } } @@ -5177,23 +5227,23 @@ ada_is_tagged_type (struct type *type) /* The type of the tag on VAL. */ -struct type* -ada_tag_type (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 (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* +struct type * ada_parent_type (struct type *type) { int i; @@ -5217,8 +5267,8 @@ ada_parent_type (struct type *type) int 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))); } @@ -5231,36 +5281,36 @@ ada_is_parent_field (struct type *type, int field_num) int 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 (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* +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 @@ -5274,7 +5324,7 @@ ada_variant_discrim_type (struct type *var_type, struct type *outer_type) int 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'); } @@ -5282,15 +5332,15 @@ ada_is_others_clause (struct type *type, int 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 * +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); @@ -5311,19 +5361,19 @@ ada_variant_discrim_name (struct type *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; } @@ -5336,11 +5386,11 @@ ada_variant_discrim_name (struct type *type0) does not occur. */ int -ada_scan_number (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 @@ -5349,14 +5399,14 @@ ada_scan_number (const char str[], int k, LONGEST *R, int *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) @@ -5377,23 +5427,23 @@ ada_scan_number (const char str[], int k, LONGEST *R, int *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 +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; @@ -5402,9 +5452,8 @@ ada_in_variant (LONGEST val, struct type *type, int 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; @@ -5424,11 +5473,11 @@ ada_in_variant (LONGEST val, struct type *type, int 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 (struct value* arg1, int offset, int fieldno, +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); @@ -5440,10 +5489,10 @@ ada_value_primitive_field (struct value* arg1, int offset, int fieldno, { 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); @@ -5456,14 +5505,14 @@ ada_value_primitive_field (struct value* arg1, int offset, int fieldno, Searches recursively through wrapper fields (e.g., '_parent'). */ -struct value* -ada_search_struct_field (char *name, struct value* arg, int offset, +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); @@ -5471,14 +5520,17 @@ ada_search_struct_field (char *name, struct value* arg, int offset, 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; } @@ -5491,11 +5543,13 @@ ada_search_struct_field (char *name, struct value* arg, int offset, 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; } @@ -5503,7 +5557,7 @@ ada_search_struct_field (char *name, struct value* arg, int offset, } 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. @@ -5515,11 +5569,11 @@ ada_search_struct_field (char *name, struct value* arg, int offset, ERR is a name (for use in error messages) that identifies the class of entity that ARG is supposed to be. */ -struct value* +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)); @@ -5532,9 +5586,9 @@ ada_value_struct_elt (struct value *arg, char *name, char *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) @@ -5560,7 +5614,8 @@ ada_value_struct_elt (struct value *arg, char *name, char *err) If NOERR is nonzero, return NULL if NAME is not suitably defined. */ struct type * -ada_lookup_struct_elt_type (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; @@ -5593,13 +5648,13 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int noerr, int *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)); } @@ -5607,7 +5662,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int noerr, int *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) { @@ -5629,7 +5684,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int noerr, int *dispp name, 1, &disp); if (t != NULL) { - if (dispp != NULL) + if (dispp != NULL) *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8; return t; } @@ -5639,7 +5694,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int noerr, int *dispp } BadName: - if (! noerr) + if (!noerr) { target_terminal_ours (); gdb_flush (gdb_stdout); @@ -5657,19 +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 +int ada_which_variant_applies (struct type *var_type, struct type *outer_type, - char* outer_valaddr) + 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; @@ -5686,9 +5741,9 @@ ada_which_variant_applies (struct type *var_type, struct type *outer_type, return others_clause; } + - /* Dynamic-Sized Records */ /* Strategy: The type ostensibly attached to a value with dynamic size @@ -5728,28 +5783,29 @@ ada_which_variant_applies (struct type *var_type, struct type *outer_type, dereferencing it. Differs from value_ind in its treatment of dynamic-sized types. */ -struct value* -ada_value_ind (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 (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; } @@ -5782,29 +5838,29 @@ field_offset (struct type *type, int f) static unsigned int 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* +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) @@ -5822,7 +5878,7 @@ ada_find_any_type (const char *name) that of TYPE1 for purposes of type printing, return non-zero; otherwise return 0. */ int -ada_prefer_type (struct type* type0, struct type* type1) +ada_prefer_type (struct type *type0, struct type *type1) { if (type1 == NULL) return 1; @@ -5834,9 +5890,10 @@ ada_prefer_type (struct type* type0, struct type* 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; @@ -5844,10 +5901,10 @@ ada_prefer_type (struct type* type0, struct type* 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 (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); @@ -5858,23 +5915,23 @@ ada_type_name (struct type* type) /* Find a parallel type to TYPE whose name is formed by appending SUFFIX to the name of TYPE. */ -struct type* +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); @@ -5886,15 +5943,15 @@ ada_find_parallel_type (struct type *type, const char *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 (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")) @@ -5907,11 +5964,11 @@ dynamic_template_type (struct 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 (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; } @@ -5919,8 +5976,8 @@ is_dynamic_field (struct type* templ_type, int field_num) /* Assuming that TYPE is a struct type, returns non-zero iff TYPE contains a variant part. */ -static int -contains_variant_part (struct type* type) +static int +contains_variant_part (struct type *type) { int f; @@ -5931,10 +5988,10 @@ contains_variant_part (struct type* type) } /* A record type with no fields, . */ -static struct type* -empty_record (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; @@ -5957,13 +6014,13 @@ empty_record (struct objfile* objfile) * variants occupy whole numbers of bytes. However, they need not be * byte-aligned. */ -static struct type* -template_to_fixed_record_type (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; @@ -5973,44 +6030,44 @@ template_to_fixed_record_type (struct type* type, char* valaddr, 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 { @@ -6024,18 +6081,16 @@ template_to_fixed_record_type (struct type* type, char* valaddr, 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; @@ -6045,7 +6100,7 @@ template_to_fixed_record_type (struct type* type, char* valaddr, 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 = @@ -6059,7 +6114,7 @@ template_to_fixed_record_type (struct type* type, char* valaddr, 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; } @@ -6071,8 +6126,8 @@ template_to_fixed_record_type (struct type* type, char* valaddr, 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 (struct type* templ_type) +static struct type * +template_to_static_fixed_type (struct type *templ_type) { struct type *type; int nfields; @@ -6082,34 +6137,35 @@ template_to_static_fixed_type (struct 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); } @@ -6121,12 +6177,12 @@ template_to_static_fixed_type (struct 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 (struct type* type, char* valaddr, - CORE_ADDR address, struct value* dval) +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 value *mark = value_mark (); + struct type *rtype; struct type *branch_type; int nfields = TYPE_NFIELDS (type); @@ -6137,38 +6193,41 @@ to_record_with_fixed_variant_part (struct type* type, char* valaddr, 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; } @@ -6178,19 +6237,19 @@ to_record_with_fixed_variant_part (struct type* type, char* valaddr, 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 (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); @@ -6198,7 +6257,7 @@ to_fixed_record_type (struct type* type0, char* valaddr, CORE_ADDR address, 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; } @@ -6212,17 +6271,17 @@ to_fixed_record_type (struct type* type0, char* valaddr, CORE_ADDR address, 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 (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"); @@ -6230,21 +6289,21 @@ to_fixed_variant_branch_type (struct type* var_type0, char* valaddr, 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); } @@ -6258,17 +6317,17 @@ to_fixed_variant_branch_type (struct type* var_type0, char* valaddr, varsize_limit. */ -static struct type* -to_fixed_array_type (struct type* type0, struct value* dval, +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) @@ -6276,14 +6335,13 @@ to_fixed_array_type (struct type* type0, struct value* dval, 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 @@ -6297,25 +6355,24 @@ to_fixed_array_type (struct type* type0, struct value* dval, /* 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) @@ -6323,50 +6380,51 @@ to_fixed_array_type (struct type* type0, struct value* dval, DVAL describes a record containing any discriminants used in TYPE0, and may be NULL if there are none. */ -struct type* -ada_to_fixed_type (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 (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: @@ -6378,21 +6436,21 @@ to_static_fixed_type (struct type* type0) } /* A static approximation of TYPE with all type wrappers removed. */ -static struct type* -static_unwrap_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); @@ -6412,18 +6470,18 @@ static_unwrap_type (struct type* type) /* A type equivalent to TYPE that is not a non-record stub, if one exists, otherwise TYPE. */ -struct type* -ada_completed_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; } } @@ -6432,16 +6490,17 @@ ada_completed_type (struct 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 (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 @@ -6449,19 +6508,19 @@ ada_to_fixed_value (struct type* type0, char* valaddr, CORE_ADDR address, 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 (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 */ @@ -6469,24 +6528,23 @@ ada_to_static_fixed_value (struct 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* +const char * ada_attribute_name (int n) { if (n > 0 && n < (int) ATR_END) @@ -6497,12 +6555,12 @@ ada_attribute_name (int n) /* Evaluate the 'POS attribute applied to ARG. */ -static struct value* -value_pos_atr (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) @@ -6510,7 +6568,7 @@ value_pos_atr (struct value* 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); @@ -6523,12 +6581,12 @@ value_pos_atr (struct value* arg) /* Evaluate the TYPE'VAL attribute applied to ARG. */ -static struct value* -value_val_atr (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) @@ -6536,27 +6594,26 @@ value_val_atr (struct type *type, struct value* 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 (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") @@ -6569,7 +6626,7 @@ int 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) @@ -6578,7 +6635,7 @@ ada_is_string_type (struct type *type) return ada_is_character_type (elttype); } - else + else return 0; } @@ -6599,33 +6656,33 @@ ada_is_aligner_type (struct type *type) /* If there is an ___XVS-convention type parallel to SUBTYPE, return the parallel type. */ -struct type* -ada_get_base_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 (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)); @@ -6637,30 +6694,31 @@ ada_aligned_type (struct type* type) /* The address of the aligned value in an object at address VALADDR having type TYPE. Assumes ada_is_aligner_type (TYPE). */ -char* +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 (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; } @@ -6671,7 +6729,7 @@ ada_enum_name (const char* 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 @@ -6686,11 +6744,11 @@ ada_enum_name (const char* name) return result; } - else + else return name; } -static struct value* +static struct value * evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos, enum noside noside) { @@ -6701,60 +6759,60 @@ evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos, evaluate_type, updating *POS to point just past the evaluated expression. */ -static struct value* -evaluate_subexp_type (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 (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 (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); } @@ -6762,8 +6820,8 @@ cast_to_fixed (struct type *type, struct value* arg) return value_from_longest (type, val); } -static struct value* -cast_from_fixed_to_double (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)); @@ -6772,35 +6830,36 @@ cast_from_fixed_to_double (struct value* arg) /* Coerce VAL as necessary for assignment to an lval of type TYPE, and * return the converted value. */ -static struct value* -coerce_for_assign (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* +struct value * ada_evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos, enum noside noside) { @@ -6811,16 +6870,19 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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; @@ -6834,30 +6896,30 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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); @@ -6865,13 +6927,14 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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); } @@ -6888,7 +6951,8 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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)); } @@ -6904,7 +6968,8 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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)); } @@ -6919,7 +6984,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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))) @@ -6942,38 +7007,39 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, /* 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: @@ -6983,7 +7049,8 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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 */ { @@ -6998,17 +7065,18 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, (*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"); } @@ -7030,7 +7098,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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: @@ -7047,53 +7115,55 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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"); @@ -7101,47 +7171,46 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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?). */ @@ -7152,295 +7221,295 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, /* 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); @@ -7448,10 +7517,9 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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); @@ -7475,7 +7543,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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; @@ -7485,21 +7553,20 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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); @@ -7508,7 +7575,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, } 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); @@ -7522,9 +7589,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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 @@ -7539,9 +7607,9 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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); @@ -7549,9 +7617,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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 @@ -7563,27 +7632,26 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, 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* +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) @@ -7612,7 +7680,7 @@ ada_delta (struct type *type) if (sscanf (encoding, "_%ld_%ld", &num, &den) < 2) return -1.0; - else + else return (DOUBLEST) num / (DOUBLEST) den; } @@ -7625,14 +7693,14 @@ 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; } @@ -7643,7 +7711,7 @@ scaling_factor (struct type *type) DOUBLEST 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 @@ -7661,13 +7729,13 @@ ada_float_to_fixed (struct type *type, DOUBLEST x) /* Non-zero iff TYPE represents one of the special VAX floating-point types. */ int -ada_is_vax_floating_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); } @@ -7675,33 +7743,31 @@ ada_is_vax_floating_type (struct type* type) /* The type of special VAX floating-point type this is, assuming ada_is_vax_floating_point */ int -ada_vax_float_type_suffix (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 (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 @@ -7711,34 +7777,34 @@ ada_vax_float_print_function (struct type* type) not alter *PX and *PNEW_K if unsuccessful. */ static int -scan_discrim_bound (char *, 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; @@ -7751,15 +7817,16 @@ scan_discrim_bound (char *, int k, struct value* dval, LONGEST *px, int *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 (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) { @@ -7771,15 +7838,15 @@ get_var_value (char* name, char* 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 (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) @@ -7793,7 +7860,7 @@ get_int_var_value (char* name, char* err_msg, int* 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 @@ -7803,13 +7870,13 @@ get_int_var_value (char* name, char* err_msg, int* flag) information, in general, is encoded in NAME, the base type given in the named range type. */ -static struct type* +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; @@ -7839,60 +7906,60 @@ to_fixed_range_type (char *name, struct value *dval, struct objfile *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 (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 (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 @@ -7901,104 +7968,99 @@ ada_is_modular_type (struct type* type) /* Assuming ada_is_modular_type (TYPE), the modulus of TYPE. */ LONGEST -ada_modulus (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); } @@ -8023,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?) */ @@ -8046,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, @@ -8138,132 +8189,129 @@ ada_create_fundamental_type (struct objfile *objfile, int typeid) 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"); } - diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index e5353f8524b..d2b426c8ceb 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -32,13 +32,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Chain of cleanups for arguments of OP_UNRESOLVED_VALUE names. Created in yyparse and freed in ada_resolve. */ -extern struct cleanup* unresolved_names; +extern struct cleanup *unresolved_names; /* Corresponding mangled/demangled names and opcodes for Ada user-definable operators. */ -struct ada_opname_map { - const char* mangled; - const char* demangled; +struct ada_opname_map +{ + const char *mangled; + const char *demangled; enum exp_opcode op; }; @@ -53,7 +54,8 @@ extern const int MAX_NUMBER_OF_KNOWN_TASKS; to update the table attribute_names in ada-lang.c whenever you change this. */ -enum ada_attribute { +enum ada_attribute +{ /* Invalid attribute for error checking. */ ATR_INVALID, @@ -74,7 +76,8 @@ enum ada_attribute { ATR_END }; -enum task_states { +enum task_states +{ Unactivated, Runnable, Terminated, @@ -89,14 +92,18 @@ enum task_states { extern char *ada_task_states[]; -typedef struct { +typedef struct +{ char *P_ARRAY; int *P_BOUNDS; -} fat_string; +} +fat_string; -typedef struct entry_call { +typedef struct entry_call +{ void *self; -} *entry_call_link; +} + *entry_call_link; struct task_fields { @@ -126,7 +133,7 @@ struct task_fields #if (defined (VXWORKS_TARGET) && defined (M68K_TARGET)) __attribute__ ((packed)) #endif -; + ; struct task_entry { @@ -139,17 +146,17 @@ struct task_entry int stack_per; }; -extern struct type* builtin_type_ada_int; -extern struct type* builtin_type_ada_short; -extern struct type* builtin_type_ada_long; -extern struct type* builtin_type_ada_long_long; -extern struct type* builtin_type_ada_char; -extern struct type* builtin_type_ada_float; -extern struct type* builtin_type_ada_double; -extern struct type* builtin_type_ada_long_double; -extern struct type* builtin_type_ada_natural; -extern struct type* builtin_type_ada_positive; -extern struct type* builtin_type_ada_system_address; +extern struct type *builtin_type_ada_int; +extern struct type *builtin_type_ada_short; +extern struct type *builtin_type_ada_long; +extern struct type *builtin_type_ada_long_long; +extern struct type *builtin_type_ada_char; +extern struct type *builtin_type_ada_float; +extern struct type *builtin_type_ada_double; +extern struct type *builtin_type_ada_long_double; +extern struct type *builtin_type_ada_natural; +extern struct type *builtin_type_ada_positive; +extern struct type *builtin_type_ada_system_address; /* Assuming V points to an array of S objects, make sure that it contains at least M objects, updating V and S as necessary. */ @@ -157,209 +164,225 @@ extern struct type* builtin_type_ada_system_address; #define GROW_VECT(v, s, m) \ if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v))); -extern void grow_vect (void**, size_t*, size_t, int); +extern void grow_vect (void **, size_t *, size_t, int); extern int ada_parse (void); /* Defined in ada-exp.y */ extern void ada_error (char *); /* Defined in ada-exp.y */ - /* Defined in ada-typeprint.c */ -extern void ada_print_type (struct type*, char*, struct ui_file*, int, int); + /* Defined in ada-typeprint.c */ +extern void ada_print_type (struct type *, char *, struct ui_file *, int, + int); -extern int ada_val_print (struct type*, char*, int, CORE_ADDR, - struct ui_file*, int, int, int, enum val_prettyprint); +extern int ada_val_print (struct type *, char *, int, CORE_ADDR, + struct ui_file *, int, int, int, + enum val_prettyprint); -extern int ada_value_print (struct value*, struct ui_file*, int, +extern int ada_value_print (struct value *, struct ui_file *, int, enum val_prettyprint); /* Defined in ada-lang.c */ -extern struct value* value_from_contents_and_address (struct type*, char*, CORE_ADDR); +extern struct value *value_from_contents_and_address (struct type *, char *, + CORE_ADDR); extern void ada_emit_char (int, struct ui_file *, int, int); -extern void ada_printchar (int, struct ui_file*); +extern void ada_printchar (int, struct ui_file *); -extern void ada_printstr (struct ui_file*, char *, unsigned int, int, int); +extern void ada_printstr (struct ui_file *, char *, unsigned int, int, int); -extern void ada_convert_actuals (struct value*, int, struct value**, CORE_ADDR*); +extern void ada_convert_actuals (struct value *, int, struct value **, + CORE_ADDR *); -extern struct value* ada_value_subscript (struct value*, int, struct value**); +extern struct value *ada_value_subscript (struct value *, int, + struct value **); -extern struct type* ada_array_element_type (struct type*, int); +extern struct type *ada_array_element_type (struct type *, int); -extern int ada_array_arity (struct type*); +extern int ada_array_arity (struct type *); -struct type* ada_type_of_array (struct value*, int); +struct type *ada_type_of_array (struct value *, int); -extern struct value* ada_coerce_to_simple_array (struct value*); +extern struct value *ada_coerce_to_simple_array (struct value *); -extern struct value* ada_coerce_to_simple_array_ptr (struct value*); +extern struct value *ada_coerce_to_simple_array_ptr (struct value *); -extern int ada_is_simple_array (struct type*); +extern int ada_is_simple_array (struct type *); -extern int ada_is_array_descriptor (struct type*); +extern int ada_is_array_descriptor (struct type *); -extern int ada_is_bogus_array_descriptor (struct type*); +extern int ada_is_bogus_array_descriptor (struct type *); -extern struct type* ada_index_type (struct type*, int); +extern struct type *ada_index_type (struct type *, int); -extern struct value* ada_array_bound (struct value*, int, int); +extern struct value *ada_array_bound (struct value *, int, int); -extern int ada_lookup_symbol_list (const char*, struct block*, namespace_enum, - struct symbol***, struct block***); +extern int ada_lookup_symbol_list (const char *, struct block *, + namespace_enum, struct symbol ***, + struct block ***); -extern char* ada_fold_name (const char*); +extern char *ada_fold_name (const char *); -extern struct symbol* ada_lookup_symbol (const char*, struct block*, namespace_enum); +extern struct symbol *ada_lookup_symbol (const char *, struct block *, + namespace_enum); -extern struct minimal_symbol* ada_lookup_minimal_symbol (const char*); +extern struct minimal_symbol *ada_lookup_minimal_symbol (const char *); -extern void ada_resolve (struct expression**, struct type*); +extern void ada_resolve (struct expression **, struct type *); -extern int ada_resolve_function (struct symbol**, struct block**, int, - struct value**, int, const char*, struct type*); +extern int ada_resolve_function (struct symbol **, struct block **, int, + struct value **, int, const char *, + struct type *); -extern void ada_fill_in_ada_prototype (struct symbol*); +extern void ada_fill_in_ada_prototype (struct symbol *); -extern int user_select_syms (struct symbol**, struct block**, int, int); +extern int user_select_syms (struct symbol **, struct block **, int, int); -extern int get_selections (int*, int, int, int, char*); +extern int get_selections (int *, int, int, int, char *); -extern char* ada_start_decode_line_1 (char*); +extern char *ada_start_decode_line_1 (char *); -extern struct symtabs_and_lines ada_finish_decode_line_1 (char**, struct symtab*, int, char***); +extern struct symtabs_and_lines ada_finish_decode_line_1 (char **, + struct symtab *, + int, char ***); -extern int ada_scan_number (const char*, int, LONGEST*, int*); +extern int ada_scan_number (const char *, int, LONGEST *, int *); -extern struct type* ada_parent_type (struct type*); +extern struct type *ada_parent_type (struct type *); -extern int ada_is_ignored_field (struct type*, int); +extern int ada_is_ignored_field (struct type *, int); -extern int ada_is_packed_array_type (struct type*); +extern int ada_is_packed_array_type (struct type *); -extern struct value* ada_value_primitive_packed_val (struct value*, char*, long, int, - int, struct type*); +extern struct value *ada_value_primitive_packed_val (struct value *, char *, + long, int, int, + struct type *); -extern struct type* ada_coerce_to_simple_array_type (struct type*); +extern struct type *ada_coerce_to_simple_array_type (struct type *); -extern int ada_is_character_type (struct type*); +extern int ada_is_character_type (struct type *); -extern int ada_is_string_type (struct type*); +extern int ada_is_string_type (struct type *); -extern int ada_is_tagged_type (struct type*); +extern int ada_is_tagged_type (struct type *); -extern struct type* ada_tag_type (struct value*); +extern struct type *ada_tag_type (struct value *); -extern struct value* ada_value_tag (struct value*); +extern struct value *ada_value_tag (struct value *); -extern int ada_is_parent_field (struct type*, int); +extern int ada_is_parent_field (struct type *, int); -extern int ada_is_wrapper_field (struct type*, int); +extern int ada_is_wrapper_field (struct type *, int); -extern int ada_is_variant_part (struct type*, int); +extern int ada_is_variant_part (struct type *, int); -extern struct type* ada_variant_discrim_type (struct type*, struct type*); +extern struct type *ada_variant_discrim_type (struct type *, struct type *); -extern int ada_is_others_clause (struct type*, int); +extern int ada_is_others_clause (struct type *, int); -extern int ada_in_variant (LONGEST, struct type*, int); +extern int ada_in_variant (LONGEST, struct type *, int); -extern char* ada_variant_discrim_name (struct type*); +extern char *ada_variant_discrim_name (struct type *); -extern struct type* ada_lookup_struct_elt_type (struct type*, char*, int, int*); +extern struct type *ada_lookup_struct_elt_type (struct type *, char *, int, + int *); -extern struct value* ada_value_struct_elt (struct value*, char*, char*); +extern struct value *ada_value_struct_elt (struct value *, char *, char *); -extern struct value* ada_search_struct_field (char*, struct value*, int, struct type*); +extern struct value *ada_search_struct_field (char *, struct value *, int, + struct type *); -extern int ada_is_aligner_type (struct type*); +extern int ada_is_aligner_type (struct type *); -extern struct type* ada_aligned_type (struct type*); +extern struct type *ada_aligned_type (struct type *); -extern char* ada_aligned_value_addr (struct type*, char*); +extern char *ada_aligned_value_addr (struct type *, char *); -extern const char* ada_attribute_name (int); +extern const char *ada_attribute_name (int); -extern int ada_is_fixed_point_type (struct type*); +extern int ada_is_fixed_point_type (struct type *); -extern DOUBLEST ada_delta (struct type*); +extern DOUBLEST ada_delta (struct type *); extern DOUBLEST ada_fixed_to_float (struct type *, LONGEST); -extern LONGEST ada_float_to_fixed (struct type*, DOUBLEST); +extern LONGEST ada_float_to_fixed (struct type *, DOUBLEST); -extern int ada_is_vax_floating_type (struct type*); +extern int ada_is_vax_floating_type (struct type *); -extern int ada_vax_float_type_suffix (struct type*); +extern int ada_vax_float_type_suffix (struct type *); -extern struct value* ada_vax_float_print_function (struct type*); +extern struct value *ada_vax_float_print_function (struct type *); -extern struct type* ada_system_address_type (void); +extern struct type *ada_system_address_type (void); -extern int ada_which_variant_applies (struct type*, struct type*, char*); +extern int ada_which_variant_applies (struct type *, struct type *, char *); -extern struct value* ada_to_fixed_value (struct type*, char*, CORE_ADDR, struct value*); +extern struct value *ada_to_fixed_value (struct type *, char *, CORE_ADDR, + struct value *); -extern struct type* ada_to_fixed_type (struct type*, char*, CORE_ADDR, struct value*); +extern struct type *ada_to_fixed_type (struct type *, char *, CORE_ADDR, + struct value *); -extern int ada_name_prefix_len (const char*); +extern int ada_name_prefix_len (const char *); -extern char* ada_type_name (struct type*); +extern char *ada_type_name (struct type *); -extern struct type* ada_find_parallel_type (struct type*, const char *suffix); +extern struct type *ada_find_parallel_type (struct type *, + const char *suffix); -extern LONGEST get_int_var_value (char*, char*, int* ); +extern LONGEST get_int_var_value (char *, char *, int *); -extern struct type* ada_find_any_type (const char *name); +extern struct type *ada_find_any_type (const char *name); -extern int ada_prefer_type (struct type*, struct type*); +extern int ada_prefer_type (struct type *, struct type *); -extern struct type* ada_get_base_type (struct type*); +extern struct type *ada_get_base_type (struct type *); -extern struct type* ada_completed_type (struct type*); +extern struct type *ada_completed_type (struct type *); -extern char* ada_mangle (const char*); +extern char *ada_mangle (const char *); -extern const char* ada_enum_name (const char*); +extern const char *ada_enum_name (const char *); -extern int ada_is_modular_type (struct type*); +extern int ada_is_modular_type (struct type *); -extern LONGEST ada_modulus (struct type*); +extern LONGEST ada_modulus (struct type *); -extern struct value* ada_value_ind (struct value*); +extern struct value *ada_value_ind (struct value *); -extern void ada_print_scalar (struct type*, LONGEST, struct ui_file*); +extern void ada_print_scalar (struct type *, LONGEST, struct ui_file *); -extern int ada_is_range_type_name (const char*); +extern int ada_is_range_type_name (const char *); -extern const char* ada_renaming_type (struct type*); +extern const char *ada_renaming_type (struct type *); -extern int ada_is_object_renaming (struct symbol*); +extern int ada_is_object_renaming (struct symbol *); -extern const char* ada_simple_renamed_entity (struct symbol*); +extern const char *ada_simple_renamed_entity (struct symbol *); -extern char* ada_breakpoint_rewrite (char*, int*); +extern char *ada_breakpoint_rewrite (char *, int *); /* Tasking-related: ada-tasks.c */ extern int valid_task_id (int); -extern int get_current_task (void); +extern int get_current_task (void); extern void init_task_list (void); -extern void* get_self_id (void); +extern void *get_self_id (void); extern int get_current_task (void); -extern int get_entry_number (void*); +extern int get_entry_number (void *); extern void ada_report_exception_break (struct breakpoint *); -extern int ada_maybe_exception_partial_symbol (struct partial_symbol* sym); +extern int ada_maybe_exception_partial_symbol (struct partial_symbol *sym); -extern int ada_is_exception_sym (struct symbol* sym); +extern int ada_is_exception_sym (struct symbol *sym); #endif diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index a13da56f4dd..cc9f67f61c2 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -4,7 +4,7 @@ . This file is part of GDB. - [$Id: ada-tasks.c,v 1.2 2002/07/13 12:24:05 aidan Exp $] + [$Id: ada-tasks.c,v 1.3 2002/07/20 16:08:19 aidan Exp $] Authors: Roch-Alexandre Nomine Beguin, Arnaud Charlet <charlet@gnat.com> This program is free software; you can redistribute it and/or modify @@ -14,9 +14,9 @@ */ -#include <ctype.h> -#include "defs.h" -#include "command.h" +#include <ctype.h> +#include "defs.h" +#include "command.h" #include "value.h" #include "language.h" #include "inferior.h" @@ -30,7 +30,7 @@ #if (defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)) #include "gregset.h" -#endif +#endif #include "ada-lang.h" @@ -71,10 +71,10 @@ extern int dec_thread_get_registers (gdb_gregset_t *, gdb_fpregset_t *); #elif defined (sun) && defined (__SVR4) #define GET_CURRENT_THREAD solaris_thread_get_current_thread #define THREAD_FETCH_REGISTERS() (-1) -extern void *GET_CURRENT_THREAD(); +extern void *GET_CURRENT_THREAD (); #elif defined (_AIX) || (defined(__alpha__) && defined(__osf__)) -extern void *GET_CURRENT_THREAD(); +extern void *GET_CURRENT_THREAD (); #elif defined (__WIN32__) || defined (hpux) #define GET_CURRENT_THREAD() (inferior_pid) @@ -90,7 +90,7 @@ extern void *GET_CURRENT_THREAD(); #define READ_MEMORY(addr, var) read_memory (addr, (char*) &var, sizeof (var)) /* external declarations */ -extern struct value* find_function_in_inferior (char *); +extern struct value *find_function_in_inferior (char *); /* Global visible variables */ @@ -110,8 +110,7 @@ const int MAX_NUMBER_OF_KNOWN_TASKS = 1000; int current_task = -1, current_task_id = -1, current_task_index; void *current_thread, *current_lwp; -char *ada_task_states[] = -{ +char *ada_task_states[] = { "Unactivated", "Runnable", "Terminated", @@ -131,8 +130,7 @@ char *ada_task_states[] = /* Global internal types */ -static char *ada_long_task_states[] = -{ +static char *ada_long_task_states[] = { "Unactivated", "Runnable", "Terminated", @@ -153,10 +151,10 @@ static char *ada_long_task_states[] = /* Global internal variables */ static int highest_task_num = 0; -int thread_support = 0; /* 1 if the thread library in use is supported */ +int thread_support = 0; /* 1 if the thread library in use is supported */ static int gdbtk_task_initialization = 0; -static int +static int add_task_entry (void *p_task_id, int index) { struct task_entry *new_task_entry = NULL; @@ -176,11 +174,12 @@ add_task_entry (void *p_task_id, int index) pt->next_task = new_task_entry; pt->stack_per = 0; } - else task_list = new_task_entry; + else + task_list = new_task_entry; return new_task_entry->task_num; } -int +int get_entry_number (void *p_task_id) { struct task_entry *pt; @@ -204,7 +203,7 @@ get_thread_entry_vptr (void *thread) while (pt != NULL) { if (pt->thread == thread) - return pt; + return pt; pt = pt->next_task; } return 0; @@ -250,7 +249,7 @@ valid_task_id (int task) void * get_self_id (void) { - struct value* val; + struct value *val; void *self_id; int result; struct task_entry *ent; @@ -270,10 +269,11 @@ get_self_id (void) return NULL; } -int get_current_task () +int +get_current_task () { int result; - + /* FIXME: language_ada should be defined in defs.h */ /* if (current_language->la_language != language_ada) return -1; */ @@ -293,22 +293,22 @@ info_task (char *arg, int from_tty) void *self_id, *caller; struct task_fields atcb, atcb2; struct entry_call call; - int bounds [2]; - char image [256]; + int bounds[2]; + char image[256]; int num; /* FIXME: language_ada should be defined in defs.h */ /* if (current_language->la_language != language_ada) - { - printf_filtered ("The current language does not support tasks.\n"); - return; - } - */ + { + printf_filtered ("The current language does not support tasks.\n"); + return; + } + */ pt = get_entry_vptr (atoi (arg)); if (pt == NULL) { - printf_filtered ("Task %s not found.\n", arg); - return; + printf_filtered ("Task %s not found.\n", arg); + return; } temp_task = pt->task_id; @@ -320,14 +320,16 @@ info_task (char *arg, int from_tty) printf_filtered ("Ada Task: %p\n", temp_task); /* print the name of the task */ - if (atcb.image.P_ARRAY != NULL) { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_BOUNDS), bounds); - bounds [1] = EXTRACT_INT (bounds [1]); - read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_ARRAY), - (char*) &image, bounds [1]); - printf_filtered ("Name: %.*s\n", bounds [1], image); - } - else printf_filtered ("<no name>\n"); + if (atcb.image.P_ARRAY != NULL) + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_BOUNDS), bounds); + bounds[1] = EXTRACT_INT (bounds[1]); + read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_ARRAY), + (char *) &image, bounds[1]); + printf_filtered ("Name: %.*s\n", bounds[1], image); + } + else + printf_filtered ("<no name>\n"); /* print the thread id */ @@ -339,9 +341,9 @@ info_task (char *arg, int from_tty) if ((long) pt->lwp != 0) { if ((long) pt->lwp < 65536) - printf_filtered ("LWP: %ld\n", (long int) pt->lwp); + printf_filtered ("LWP: %ld\n", (long int) pt->lwp); else - printf_filtered ("LWP: %p\n", pt->lwp); + printf_filtered ("LWP: %p\n", pt->lwp); } /* print the parent gdb task id */ @@ -353,16 +355,17 @@ info_task (char *arg, int from_tty) READ_MEMORY ((CORE_ADDR) pt2->task_id, atcb2); /* print the name of the task */ - if (atcb2.image.P_ARRAY != NULL) { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_BOUNDS), - bounds); - bounds [1] = EXTRACT_INT (bounds [1]); - read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_ARRAY), - (char*) &image, bounds [1]); - printf_filtered (" (%.*s)\n", bounds [1], image); - } + if (atcb2.image.P_ARRAY != NULL) + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_BOUNDS), + bounds); + bounds[1] = EXTRACT_INT (bounds[1]); + read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_ARRAY), + (char *) &image, bounds[1]); + printf_filtered (" (%.*s)\n", bounds[1], image); + } else - printf_filtered ("\n"); + printf_filtered ("\n"); } else printf_filtered ("No parent\n"); @@ -375,11 +378,12 @@ info_task (char *arg, int from_tty) /* check if this task is accepting a rendezvous */ if (atcb.call == NULL) caller = NULL; - else { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.call), call); - caller = EXTRACT_ADDRESS (call.self); - } - + else + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.call), call); + caller = EXTRACT_ADDRESS (call.self); + } + if (caller != NULL) { num = get_entry_number (caller); @@ -391,14 +395,15 @@ info_task (char *arg, int from_tty) READ_MEMORY ((CORE_ADDR) pt2->task_id, atcb2); /* print the name of the task */ - if (atcb2.image.P_ARRAY != NULL) { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_BOUNDS), - bounds); - bounds [1] = EXTRACT_INT (bounds [1]); - read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_ARRAY), - (char*) &image, bounds [1]); - printf_filtered (" (%.*s)\n", bounds [1], image); - } + if (atcb2.image.P_ARRAY != NULL) + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_BOUNDS), + bounds); + bounds[1] = EXTRACT_INT (bounds[1]); + read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb2.image.P_ARRAY), + (char *) &image, bounds[1]); + printf_filtered (" (%.*s)\n", bounds[1], image); + } else printf_filtered ("\n"); } @@ -406,7 +411,7 @@ info_task (char *arg, int from_tty) printf_filtered ("\n"); } else - printf_filtered ("State: %s\n", ada_long_task_states [atcb.state]); + printf_filtered ("State: %s\n", ada_long_task_states[atcb.state]); } #if 0 @@ -418,28 +423,37 @@ info_task (char *arg, int from_tty) print_align (void) { struct task_fields tf; - void *tf_base = &(tf); - void *tf_state = &(tf.state); - void *tf_entry_num = &(tf.entry_num); - void *tf_parent = &(tf.parent); - void *tf_priority = &(tf.priority); + void *tf_base = &(tf); + void *tf_state = &(tf.state); + void *tf_entry_num = &(tf.entry_num); + void *tf_parent = &(tf.parent); + void *tf_priority = &(tf.priority); void *tf_current_priority = &(tf.current_priority); - void *tf_image = &(tf.image); - void *tf_call = &(tf.call); - void *tf_thread = &(tf.thread); - void *tf_lwp = &(tf.lwp); + void *tf_image = &(tf.image); + void *tf_call = &(tf.call); + void *tf_thread = &(tf.thread); + void *tf_lwp = &(tf.lwp); printf_filtered ("\n"); printf_filtered ("(tf_base = 0x%x)\n", tf_base); - printf_filtered ("task_fields.entry_num at %3d (0x%x)\n", tf_entry_num - tf_base, tf_entry_num); - printf_filtered ("task_fields.state at %3d (0x%x)\n", tf_state - tf_base, tf_state); - printf_filtered ("task_fields.parent at %3d (0x%x)\n", tf_parent - tf_base, tf_parent); - printf_filtered ("task_fields.priority at %3d (0x%x)\n", tf_priority - tf_base, tf_priority); - printf_filtered ("task_fields.current_priority at %3d (0x%x)\n", tf_current_priority - tf_base, tf_current_priority); - printf_filtered ("task_fields.image at %3d (0x%x)\n", tf_image - tf_base, tf_image); - printf_filtered ("task_fields.call at %3d (0x%x)\n", tf_call - tf_base, tf_call); - printf_filtered ("task_fields.thread at %3d (0x%x)\n", tf_thread - tf_base, tf_thread); - printf_filtered ("task_fields.lwp at %3d (0x%x)\n", tf_lwp - tf_base, tf_lwp); - printf_filtered ("\n"); + printf_filtered ("task_fields.entry_num at %3d (0x%x)\n", + tf_entry_num - tf_base, tf_entry_num); + printf_filtered ("task_fields.state at %3d (0x%x)\n", + tf_state - tf_base, tf_state); + printf_filtered ("task_fields.parent at %3d (0x%x)\n", + tf_parent - tf_base, tf_parent); + printf_filtered ("task_fields.priority at %3d (0x%x)\n", + tf_priority - tf_base, tf_priority); + printf_filtered ("task_fields.current_priority at %3d (0x%x)\n", + tf_current_priority - tf_base, tf_current_priority); + printf_filtered ("task_fields.image at %3d (0x%x)\n", + tf_image - tf_base, tf_image); + printf_filtered ("task_fields.call at %3d (0x%x)\n", + tf_call - tf_base, tf_call); + printf_filtered ("task_fields.thread at %3d (0x%x)\n", + tf_thread - tf_base, tf_thread); + printf_filtered ("task_fields.lwp at %3d (0x%x)\n", + tf_lwp - tf_base, tf_lwp); + printf_filtered ("\n"); } #endif @@ -448,15 +462,15 @@ print_align (void) static void info_tasks (char *arg, int from_tty) { - struct value* val; + struct value *val; int i, task_number, state; - void *temp_task, *temp_tasks [MAX_NUMBER_OF_KNOWN_TASKS]; + void *temp_task, *temp_tasks[MAX_NUMBER_OF_KNOWN_TASKS]; struct task_entry *pt; - void *self_id, *caller, *thread_id=NULL; + void *self_id, *caller, *thread_id = NULL; struct task_fields atcb; struct entry_call call; - int bounds [2]; - char image [256]; + int bounds[2]; + char image[256]; int size; char car; @@ -474,7 +488,7 @@ info_tasks (char *arg, int from_tty) task_number = 0; - if (PIDGET(inferior_ptid) == 0) + if (PIDGET (inferior_ptid) == 0) { printf_filtered ("The program is not being run under gdb. "); printf_filtered ("Use 'run' or 'attach' first.\n"); @@ -494,7 +508,7 @@ info_tasks (char *arg, int from_tty) known_tasks_addr = (void *) SYMBOL_VALUE_ADDRESS (msym); else #ifndef VXWORKS_TARGET - return; + return; #else { if (target_lookup_symbol (KNOWN_TASKS_NAME, &known_tasks_addr) != 0) @@ -519,28 +533,29 @@ info_tasks (char *arg, int from_tty) READ_MEMORY ((CORE_ADDR) known_tasks_addr, temp_tasks); - for (i=0; i<MAX_NUMBER_OF_KNOWN_TASKS; i++) + for (i = 0; i < MAX_NUMBER_OF_KNOWN_TASKS; i++) { temp_task = EXTRACT_ADDRESS (temp_tasks[i]); if (temp_task != NULL) - { - task_number = get_entry_number (temp_task); - if (task_number == 0) + { + task_number = get_entry_number (temp_task); + if (task_number == 0) task_number = add_task_entry (temp_task, i); - } - } + } + } /* Return without printing anything if this function was called in order to init GDBTK tasking. */ - if (init_only) return; + if (init_only) + return; /* print the header */ #if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET) printf_filtered - (" ID TID P-ID Pri Stack %% State Name\n"); + (" ID TID P-ID Pri Stack %% State Name\n"); #else printf_filtered (" ID TID P-ID Pri State Name\n"); #endif @@ -579,15 +594,15 @@ info_tasks (char *arg, int from_tty) printf_filtered (" %9lx", (long) temp_task); #else #ifdef TARGET_64 - printf_filtered (" %#9lx", (unsigned long)pt->thread & 0x3ffffffffff); + printf_filtered (" %#9lx", (unsigned long) pt->thread & 0x3ffffffffff); #else - printf_filtered (" %#9lx", (long)pt->thread); + printf_filtered (" %#9lx", (long) pt->thread); #endif #endif /* print the parent gdb task id */ printf_filtered - (" %4d", get_entry_number (EXTRACT_ADDRESS (atcb.parent))); + (" %4d", get_entry_number (EXTRACT_ADDRESS (atcb.parent))); /* print the base priority of the task */ printf_filtered (" %3d", EXTRACT_INT (atcb.priority)); @@ -595,39 +610,41 @@ info_tasks (char *arg, int from_tty) #if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET) if (pt->task_num == 1 || atcb.state == Terminated) { - printf_filtered (" Unknown"); + printf_filtered (" Unknown"); goto next; } - read_memory ((CORE_ADDR)atcb.thread, &thr, sizeof (thr)); + read_memory ((CORE_ADDR) atcb.thread, &thr, sizeof (thr)); current_thread = atcb.thread; - regs.regs [SP_REGNUM] = 0; - if (dec_thread_get_registers (®s, NULL) == 0) { - pt->stack_per = (100 * ((long)thr.__stack_base - - regs.regs [SP_REGNUM])) / thr.__stack_size; - /* if the thread is terminated but still there, the - stack_base/size values are erroneous. Try to patch it */ - if (pt->stack_per < 0 || pt->stack_per > 100) pt->stack_per = 0; - } + regs.regs[SP_REGNUM] = 0; + if (dec_thread_get_registers (®s, NULL) == 0) + { + pt->stack_per = (100 * ((long) thr.__stack_base - + regs.regs[SP_REGNUM])) / thr.__stack_size; + /* if the thread is terminated but still there, the + stack_base/size values are erroneous. Try to patch it */ + if (pt->stack_per < 0 || pt->stack_per > 100) + pt->stack_per = 0; + } /* print information about stack space used in the thread */ - if (thr.__stack_size < 1024*1024) + if (thr.__stack_size < 1024 * 1024) { size = thr.__stack_size / 1024; car = 'K'; } - else if (thr.__stack_size < 1024*1024*1024) + else if (thr.__stack_size < 1024 * 1024 * 1024) { size = thr.__stack_size / 1024 / 1024; car = 'M'; } - else /* Who knows... */ + else /* Who knows... */ { size = thr.__stack_size / 1024 / 1024 / 1024; car = 'G'; } printf_filtered (" %4d%c %2d", size, car, pt->stack_per); -next: + next: #endif /* print the current state of the task */ @@ -635,13 +652,15 @@ next: /* check if this task is accepting a rendezvous */ if (atcb.call == NULL) caller = NULL; - else { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.call), call); - caller = EXTRACT_ADDRESS (call.self); - } - + else + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.call), call); + caller = EXTRACT_ADDRESS (call.self); + } + if (caller != NULL) - printf_filtered (" Accepting RV with %-4d", get_entry_number (caller)); + printf_filtered (" Accepting RV with %-4d", + get_entry_number (caller)); else { state = atcb.state; @@ -653,18 +672,21 @@ next: /* Replace "Runnable" by "Running" if this is the current task */ printf_filtered (" %-22s", "Running"); else - printf_filtered (" %-22s", ada_task_states [state]); + printf_filtered (" %-22s", ada_task_states[state]); } /* finally, print the name of the task */ - if (atcb.image.P_ARRAY != NULL) { - READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_BOUNDS), bounds); - bounds [1] = EXTRACT_INT (bounds [1]); - read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_ARRAY), - (char*)&image, bounds [1]); - printf_filtered (" %.*s\n", bounds [1], image); - } - else printf_filtered (" <no name>\n"); + if (atcb.image.P_ARRAY != NULL) + { + READ_MEMORY ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_BOUNDS), + bounds); + bounds[1] = EXTRACT_INT (bounds[1]); + read_memory ((CORE_ADDR) EXTRACT_ADDRESS (atcb.image.P_ARRAY), + (char *) &image, bounds[1]); + printf_filtered (" %.*s\n", bounds[1], image); + } + else + printf_filtered (" <no name>\n"); pt = pt->next_task; } @@ -686,10 +708,10 @@ gdbtk_tcl_tasks_initialize (void) static void info_tasks_command (char *arg, int from_tty) { - if (arg == NULL || *arg == '\000') - info_tasks (arg, from_tty); - else - info_task (arg, from_tty); + if (arg == NULL || *arg == '\000') + info_tasks (arg, from_tty); + else + info_task (arg, from_tty); } /* Switch from one thread to another. */ @@ -730,7 +752,8 @@ task_switch (void *tid, void *lwpid) #endif } - if (res == 0) stop_pc = read_pc(); + if (res == 0) + stop_pc = read_pc (); select_frame (get_current_frame ()); return res; } @@ -746,14 +769,14 @@ task_command (char *tidstr, int from_tty) if (!tidstr) error ("Please specify a task ID. Use the \"info tasks\" command to\n" - "see the IDs of currently known tasks."); + "see the IDs of currently known tasks."); num = atoi (tidstr); e = get_entry_vptr (num); if (e == NULL) error ("Task ID %d not known. Use the \"info tasks\" command to\n" - "see the IDs of currently known tasks.", num); + "see the IDs of currently known tasks.", num); if (current_task_id == -1) { @@ -771,10 +794,11 @@ task_command (char *tidstr, int from_tty) if (task_switch (e->thread, e->lwp) == 0) { /* FIXME: find_printable_frame should be defined in frame.h, and - implemented in ada-lang.c */ - /* find_printable_frame (selected_frame, frame_relative_level (selected_frame));*/ + implemented in ada-lang.c */ + /* find_printable_frame (selected_frame, frame_relative_level (selected_frame)); */ printf_filtered ("[Switching to task %d]\n", num); - print_stack_frame (selected_frame, frame_relative_level (selected_frame), 1); + print_stack_frame (selected_frame, + frame_relative_level (selected_frame), 1); } else printf_filtered ("Unable to switch to task %d\n", num); @@ -786,13 +810,11 @@ _initialize_tasks (void) static struct cmd_list_element *task_cmd_list = NULL; extern struct cmd_list_element *cmdlist; - add_info ( - "tasks", info_tasks_command, - "Without argument: list all known Ada tasks, with status information.\n" - "info tasks n: print detailed information of task n.\n"); + add_info ("tasks", info_tasks_command, + "Without argument: list all known Ada tasks, with status information.\n" + "info tasks n: print detailed information of task n.\n"); add_prefix_cmd ("task", class_run, task_command, - "Use this command to switch between tasks.\n\ - The new task ID must be currently known.", &task_cmd_list, "task ", 1, - &cmdlist); + "Use this command to switch between tasks.\n\ + The new task ID must be currently known.", &task_cmd_list, "task ", 1, &cmdlist); } diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index d53d2900fef..1aeb2c0f3b8 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -38,40 +38,42 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <string.h> #include <errno.h> -static int print_record_field_types (struct type *, struct type *, +static int print_record_field_types (struct type *, struct type *, struct ui_file *, int, int); -static void print_array_type (struct type*, struct ui_file*, int, int); +static void print_array_type (struct type *, struct ui_file *, int, int); -static void print_choices (struct type*, int, struct ui_file*, struct type*); +static void print_choices (struct type *, int, struct ui_file *, + struct type *); -static void print_range (struct type*, struct ui_file*); +static void print_range (struct type *, struct ui_file *); -static void print_range_bound (struct type*, char*, int*, struct ui_file*); +static void print_range_bound (struct type *, char *, int *, + struct ui_file *); -static void -print_dynamic_range_bound (struct type*, const char*, int, - const char*, struct ui_file*); - -static void print_range_type_named (char*, struct ui_file*); +static void +print_dynamic_range_bound (struct type *, const char *, int, + const char *, struct ui_file *); +static void print_range_type_named (char *, struct ui_file *); -static char* name_buffer; + +static char *name_buffer; static int name_buffer_len; /* The (demangled) Ada name of TYPE. This value persists until the next call. */ -static char* +static char * demangled_type_name (struct type *type) { if (ada_type_name (type) == NULL) return NULL; - else + else { - char* raw_name = ada_type_name (type); - char *s, *q; + char *raw_name = ada_type_name (type); + char *s, *q; if (name_buffer == NULL || name_buffer_len <= strlen (raw_name)) { @@ -80,7 +82,7 @@ demangled_type_name (struct type *type) } strcpy (name_buffer, raw_name); - s = (char*) strstr (name_buffer, "___"); + s = (char *) strstr (name_buffer, "___"); if (s != NULL) *s = '\0'; @@ -91,18 +93,20 @@ demangled_type_name (struct type *type) if (s == name_buffer) return name_buffer; - if (! islower (s[1])) + if (!islower (s[1])) return NULL; for (s = q = name_buffer; *s != '\0'; q += 1) { if (s[0] == '_' && s[1] == '_') { - *q = '.'; s += 2; + *q = '.'; + s += 2; } else { - *q = *s; s += 1; + *q = *s; + s += 1; } } *q = '\0'; @@ -116,25 +120,26 @@ demangled_type_name (struct type *type) NEW is the new name for a type TYPE. */ void -ada_typedef_print (struct type *type, struct symbol *new, struct ui_file *stream) +ada_typedef_print (struct type *type, struct symbol *new, + struct ui_file *stream) { - fprintf_filtered (stream, "type %.*s is ", - ada_name_prefix_len (SYMBOL_SOURCE_NAME(new)), - SYMBOL_SOURCE_NAME(new)); + fprintf_filtered (stream, "type %.*s is ", + ada_name_prefix_len (SYMBOL_SOURCE_NAME (new)), + SYMBOL_SOURCE_NAME (new)); type_print (type, "", stream, 1); } /* Print range type TYPE on STREAM. */ static void -print_range (struct type* type, struct ui_file* stream) +print_range (struct type *type, struct ui_file *stream) { - struct type* target_type; + struct type *target_type; target_type = TYPE_TARGET_TYPE (type); if (target_type == NULL) target_type = type; - switch (TYPE_CODE (target_type)) + switch (TYPE_CODE (target_type)) { case TYPE_CODE_RANGE: case TYPE_CODE_INT: @@ -156,8 +161,8 @@ print_range (struct type* type, struct ui_file* stream) Note that if the name is not defined, then we don't print anything. */ fprintf_filtered (stream, "%.*s", - ada_name_prefix_len (TYPE_NAME (type)), - TYPE_NAME (type)); + ada_name_prefix_len (TYPE_NAME (type)), + TYPE_NAME (type)); } else { @@ -165,7 +170,7 @@ print_range (struct type* type, struct ui_file* stream) and the last element of the type->fields array */ const LONGEST lower_bound = (LONGEST) TYPE_LOW_BOUND (type); const LONGEST upper_bound = - (LONGEST) TYPE_FIELD_BITPOS (type, TYPE_NFIELDS (type) -1); + (LONGEST) TYPE_FIELD_BITPOS (type, TYPE_NFIELDS (type) - 1); ada_print_scalar (target_type, lower_bound, stream); fprintf_filtered (stream, " .. "); @@ -177,7 +182,8 @@ print_range (struct type* type, struct ui_file* stream) set *N past the bound and its delimiter, if any. */ static void -print_range_bound (struct type* type, char* bounds, int* n, struct ui_file* stream) +print_range_bound (struct type *type, char *bounds, int *n, + struct ui_file *stream) { LONGEST B; if (ada_scan_number (bounds, *n, &B, n)) @@ -189,13 +195,13 @@ print_range_bound (struct type* type, char* bounds, int* n, struct ui_file* stre else { int bound_len; - char* bound = bounds + *n; - char* pend; + char *bound = bounds + *n; + char *pend; pend = strstr (bound, "__"); if (pend == NULL) *n += bound_len = strlen (bound); - else + else { bound_len = pend - bound; *n += bound_len + 2; @@ -209,7 +215,8 @@ print_range_bound (struct type* type, char* bounds, int* n, struct ui_file* stre "___U") according to the ___XD conventions. */ static void -print_dynamic_range_bound (struct type* type, const char* name, int name_len, const char* suffix, struct ui_file* stream) +print_dynamic_range_bound (struct type *type, const char *name, int name_len, + const char *suffix, struct ui_file *stream) { static char *name_buf = NULL; static size_t name_buf_len = 0; @@ -230,12 +237,12 @@ print_dynamic_range_bound (struct type* type, const char* name, int name_len, co /* Print the range type named NAME. */ static void -print_range_type_named (char* name, struct ui_file* stream) +print_range_type_named (char *name, struct ui_file *stream) { 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; @@ -259,22 +266,24 @@ print_range_type_named (char* name, struct ui_file* stream) bounds_str = strchr (subtype_info, '_'); n = 1; - if (*subtype_info == 'L') + if (*subtype_info == 'L') { print_range_bound (raw_type, bounds_str, &n, stream); subtype_info += 1; } else - print_dynamic_range_bound (raw_type, name, prefix_len, "___L", stream); + print_dynamic_range_bound (raw_type, name, prefix_len, "___L", + stream); fprintf_filtered (stream, " .. "); - if (*subtype_info == 'U') + if (*subtype_info == 'U') print_range_bound (raw_type, bounds_str, &n, stream); else - print_dynamic_range_bound (raw_type, name, prefix_len, "___U", stream); + print_dynamic_range_bound (raw_type, name, prefix_len, "___U", + stream); } -} +} /* Print enumerated type TYPE on STREAM. */ @@ -291,7 +300,8 @@ print_enum_type (struct type *type, struct ui_file *stream) for (i = 0; i < len; i++) { QUIT; - if (i) fprintf_filtered (stream, ", "); + if (i) + fprintf_filtered (stream, ", "); wrap_here (" "); fputs_filtered (ada_enum_name (TYPE_FIELD_NAME (type, i)), stream); if (lastval != TYPE_FIELD_BITPOS (type, i)) @@ -317,7 +327,7 @@ print_fixed_point_type (struct type *type, struct ui_file *stream) else { fprintf_filtered (stream, "delta %g", (double) delta); - if (delta != small) + if (delta != small) fprintf_filtered (stream, " <'small = %g>", (double) small); } } @@ -337,7 +347,8 @@ print_vax_floating_point_type (struct type *type, struct ui_file *stream) structure to show (see ada_print_type). */ static void -print_array_type (struct type *type, struct ui_file *stream, int show, int level) +print_array_type (struct type *type, struct ui_file *stream, int show, + int level) { int bitsize; int n_indices; @@ -346,17 +357,17 @@ print_array_type (struct type *type, struct ui_file *stream, int show, int level fprintf_filtered (stream, "array ("); n_indices = -1; - if (show < 0) + if (show < 0) fprintf_filtered (stream, "..."); else { if (ada_is_packed_array_type (type)) type = ada_coerce_to_simple_array_type (type); - if (ada_is_simple_array (type)) + if (ada_is_simple_array (type)) { - struct type* range_desc_type = + struct type *range_desc_type = ada_find_parallel_type (type, "___XA"); - struct type* arr_type; + struct type *arr_type; bitsize = 0; if (range_desc_type == NULL) @@ -371,24 +382,24 @@ print_array_type (struct type *type, struct ui_file *stream, int show, int level bitsize = TYPE_FIELD_BITSIZE (arr_type, 0); } } - else + else { int k; - n_indices = TYPE_NFIELDS (range_desc_type); - for (k = 0, arr_type = type; + n_indices = TYPE_NFIELDS (range_desc_type); + for (k = 0, arr_type = type; k < n_indices; k += 1, arr_type = TYPE_TARGET_TYPE (arr_type)) { if (k > 0) fprintf_filtered (stream, ", "); - print_range_type_named (TYPE_FIELD_NAME (range_desc_type, k), - stream); + print_range_type_named (TYPE_FIELD_NAME + (range_desc_type, k), stream); if (TYPE_FIELD_BITSIZE (arr_type, 0) > 0) bitsize = TYPE_FIELD_BITSIZE (arr_type, 0); - } + } } } - else + else { int i, i0; for (i = i0 = ada_array_arity (type); i > 0; i -= 1) @@ -398,8 +409,8 @@ print_array_type (struct type *type, struct ui_file *stream, int show, int level fprintf_filtered (stream, ") of "); wrap_here (""); - ada_print_type (ada_array_element_type (type, n_indices), "", stream, - show == 0 ? 0 : show-1, level+1); + ada_print_type (ada_array_element_type (type, n_indices), "", stream, + show == 0 ? 0 : show - 1, level + 1); if (bitsize > 0) fprintf_filtered (stream, " <packed: %d-bit elements>", bitsize); } @@ -408,18 +419,19 @@ print_array_type (struct type *type, struct ui_file *stream, int show, int level STREAM, assuming the VAL_TYPE is the type of the values. */ static void -print_choices (struct type *type, int field_num, struct ui_file *stream, struct type *val_type) +print_choices (struct type *type, int field_num, struct ui_file *stream, + struct type *val_type) { int have_output; int p; - const char* name = TYPE_FIELD_NAME (type, field_num); + const char *name = TYPE_FIELD_NAME (type, field_num); have_output = 0; /* Skip over leading 'V': NOTE soon to be obsolete. */ if (name[0] == 'V') { - if (! ada_scan_number (name, 1, NULL, &p)) + if (!ada_scan_number (name, 1, NULL, &p)) goto Huh; } else @@ -427,25 +439,25 @@ print_choices (struct type *type, int field_num, struct ui_file *stream, struct while (1) { - switch (name[p]) + switch (name[p]) { default: return; case 'S': case 'R': case 'O': - if (have_output) + if (have_output) fprintf_filtered (stream, " | "); have_output = 1; break; } - switch (name[p]) + switch (name[p]) { case 'S': { LONGEST W; - if (! ada_scan_number (name, p + 1, &W, &p)) + if (!ada_scan_number (name, p + 1, &W, &p)) goto Huh; ada_print_scalar (val_type, W, stream); break; @@ -453,9 +465,8 @@ print_choices (struct type *type, int field_num, struct ui_file *stream, struct 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)) goto Huh; ada_print_scalar (val_type, L, stream); fprintf_filtered (stream, " .. "); @@ -498,7 +509,7 @@ print_variant_clauses (struct type *type, int field_num, if (TYPE_CODE (var_type) == TYPE_CODE_PTR) { var_type = TYPE_TARGET_TYPE (var_type); - if (TYPE_FLAGS (var_type) & TYPE_FLAG_STUB) + if (TYPE_FLAGS (var_type) & TYPE_FLAG_STUB) { var_type = ada_find_parallel_type (var_type, "___XVU"); if (var_type == NULL) @@ -506,13 +517,13 @@ print_variant_clauses (struct type *type, int field_num, } } - for (i = 0; i < TYPE_NFIELDS (var_type); i += 1) + for (i = 0; i < TYPE_NFIELDS (var_type); i += 1) { fprintf_filtered (stream, "\n%*swhen ", level + 4, ""); print_choices (var_type, i, stream, discr_type); fprintf_filtered (stream, " =>"); - if (print_record_field_types (TYPE_FIELD_TYPE (var_type, i), - outer_type, stream, show, level+4) <= 0) + if (print_record_field_types (TYPE_FIELD_TYPE (var_type, i), + outer_type, stream, show, level + 4) <= 0) fprintf_filtered (stream, " null;"); } } @@ -530,9 +541,10 @@ print_variant_part (struct type *type, int field_num, struct type *outer_type, struct ui_file *stream, int show, int level) { fprintf_filtered (stream, "\n%*scase %s is", level + 4, "", - ada_variant_discrim_name - (TYPE_FIELD_TYPE (type, field_num))); - print_variant_clauses (type, field_num, outer_type, stream, show, level + 4); + ada_variant_discrim_name + (TYPE_FIELD_TYPE (type, field_num))); + print_variant_clauses (type, field_num, outer_type, stream, show, + level + 4); fprintf_filtered (stream, "\n%*send case;", level + 4, ""); } @@ -561,13 +573,12 @@ print_record_field_types (struct type *type, struct type *outer_type, { QUIT; - if (ada_is_parent_field (type, i) - || ada_is_ignored_field (type, i)) + if (ada_is_parent_field (type, i) || ada_is_ignored_field (type, i)) ; else if (ada_is_wrapper_field (type, i)) flds += print_record_field_types (TYPE_FIELD_TYPE (type, i), type, stream, show, level); - else if (ada_is_variant_part (type, i)) + else if (ada_is_variant_part (type, i)) { print_variant_part (type, i, outer_type, stream, show, level); flds = 1; @@ -591,22 +602,23 @@ print_record_field_types (struct type *type, struct type *outer_type, the number of levels of internal structure to show (see ada_print_type). */ static void -print_record_type (struct type* type0, struct ui_file* stream, int show, int level) +print_record_type (struct type *type0, struct ui_file *stream, int show, + int level) { - struct type* parent_type; - struct type* type; - + struct type *parent_type; + struct type *type; + type = type0; if (TYPE_FLAGS (type) & TYPE_FLAG_STUB) { - struct type* type1 = ada_find_parallel_type (type, "___XVE"); + struct type *type1 = ada_find_parallel_type (type, "___XVE"); if (type1 != NULL) type = type1; } parent_type = ada_parent_type (type); - if (ada_type_name (parent_type) != NULL) - fprintf_filtered (stream, "new %s with ", + if (ada_type_name (parent_type) != NULL) + fprintf_filtered (stream, "new %s with ", demangled_type_name (parent_type)); else if (parent_type == NULL && ada_is_tagged_type (type)) fprintf_filtered (stream, "tagged "); @@ -621,15 +633,15 @@ print_record_type (struct type* type0, struct ui_file* stream, int show, int lev flds = 0; if (parent_type != NULL && ada_type_name (parent_type) == NULL) - flds += print_record_field_types (parent_type, parent_type, + flds += print_record_field_types (parent_type, parent_type, stream, show, level); flds += print_record_field_types (type, type, stream, show, level); - + if (flds > 0) fprintf_filtered (stream, "\n%*send record", level, ""); - else if (flds < 0) + else if (flds < 0) fprintf_filtered (stream, " <incomplete type> end record"); - else + else fprintf_filtered (stream, " null; end record"); } } @@ -639,44 +651,43 @@ print_record_type (struct type* type0, struct ui_file* stream, int show, int lev in case the element type itself has nested structure, and SHOW is the number of levels of internal structure to show (see ada_print_type). */ static void -print_unchecked_union_type (struct type* type, struct ui_file* stream, +print_unchecked_union_type (struct type *type, struct ui_file *stream, int show, int level) { fprintf_filtered (stream, "record (?) is"); if (show < 0) fprintf_filtered (stream, " ... end record"); - else if (TYPE_NFIELDS (type) == 0) + else if (TYPE_NFIELDS (type) == 0) fprintf_filtered (stream, " null; end record"); else { int i; - fprintf_filtered (stream, "\n%*scase ? is", - level+4, ""); + fprintf_filtered (stream, "\n%*scase ? is", level + 4, ""); - for (i = 0; i < TYPE_NFIELDS (type); i += 1) + for (i = 0; i < TYPE_NFIELDS (type); i += 1) { - fprintf_filtered (stream, "\n%*swhen ? =>\n%*s", level+8, "", - level+12, ""); + fprintf_filtered (stream, "\n%*swhen ? =>\n%*s", level + 8, "", + level + 12, ""); ada_print_type (TYPE_FIELD_TYPE (type, i), TYPE_FIELD_NAME (type, i), stream, show - 1, level + 12); fprintf_filtered (stream, ";"); } - fprintf_filtered (stream, "\n%*send case;\n%*send record", - level+4, "", level, ""); + fprintf_filtered (stream, "\n%*send case;\n%*send record", + level + 4, "", level, ""); } } - + /* Print function or procedure type TYPE on STREAM. Make it a header for function or procedure NAME if NAME is not null. */ static void -print_func_type (struct type *type, struct ui_file *stream, char* name) +print_func_type (struct type *type, struct ui_file *stream, char *name) { int i, len = TYPE_NFIELDS (type); @@ -685,10 +696,10 @@ print_func_type (struct type *type, struct ui_file *stream, char* name) else fprintf_filtered (stream, "function"); - if (name != NULL && name[0] != '\0') + if (name != NULL && name[0] != '\0') fprintf_filtered (stream, " %s", name); - if (len > 0) + if (len > 0) { fprintf_filtered (stream, " ("); for (i = 0; i < len; i += 1) @@ -698,11 +709,11 @@ print_func_type (struct type *type, struct ui_file *stream, char* name) fputs_filtered ("; ", stream); wrap_here (" "); } - fprintf_filtered (stream, "a%d: ", i+1); + fprintf_filtered (stream, "a%d: ", i + 1); ada_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0); } fprintf_filtered (stream, ")"); - } + } if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) { @@ -726,35 +737,34 @@ print_func_type (struct type *type, struct ui_file *stream, char* name) LEVEL indicates level of recursion (for nested definitions). */ void -ada_print_type (struct type* type0, char* varstring, struct ui_file* stream, +ada_print_type (struct type *type0, char *varstring, struct ui_file *stream, int show, int level) { enum type_code code; int demangled_args; - struct type* type = ada_completed_type (ada_get_base_type (type0)); - char* type_name = demangled_type_name (type); + struct type *type = ada_completed_type (ada_get_base_type (type0)); + char *type_name = demangled_type_name (type); int is_var_decl = (varstring != NULL && varstring[0] != '\0'); if (type == NULL) { if (is_var_decl) fprintf_filtered (stream, "%.*s: ", - ada_name_prefix_len(varstring), - varstring); + ada_name_prefix_len (varstring), varstring); fprintf_filtered (stream, "<null type?>"); return; } if (show > 0) - CHECK_TYPEDEF (type); + CHECK_TYPEDEF (type); if (is_var_decl && TYPE_CODE (type) != TYPE_CODE_FUNC) - fprintf_filtered (stream, "%.*s: ", - ada_name_prefix_len (varstring), varstring); + fprintf_filtered (stream, "%.*s: ", + ada_name_prefix_len (varstring), varstring); if (type_name != NULL && show <= 0) { - fprintf_filtered (stream, "%.*s", + fprintf_filtered (stream, "%.*s", ada_name_prefix_len (type_name), type_name); return; } @@ -764,78 +774,78 @@ ada_print_type (struct type* type0, char* varstring, struct ui_file* stream, else if (ada_is_packed_array_type (type)) print_array_type (type, stream, show, level); else - switch (TYPE_CODE (type)) - { - default: - fprintf_filtered (stream, "<"); - c_print_type (type, "", stream, show, level); - fprintf_filtered (stream, ">"); - break; - case TYPE_CODE_PTR: - fprintf_filtered (stream, "access "); - ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, - level); - break; - case TYPE_CODE_REF: - fprintf_filtered (stream, "<ref> "); - ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, - level); - break; - case TYPE_CODE_ARRAY: - print_array_type (type, stream, show, level); - break; - case TYPE_CODE_INT: - if (ada_is_fixed_point_type (type)) - print_fixed_point_type (type, stream); - else if (ada_is_vax_floating_type (type)) - print_vax_floating_point_type (type, stream); - else - { - char* name = ada_type_name (type); - if (! ada_is_range_type_name (name)) - fprintf_filtered (stream, "<%d-byte integer>", TYPE_LENGTH (type)); - else - { - fprintf_filtered (stream, "range "); - print_range_type_named (name, stream); - } - } - break; - case TYPE_CODE_RANGE: - if (ada_is_fixed_point_type (type)) - print_fixed_point_type (type, stream); - else if (ada_is_vax_floating_type (type)) - print_vax_floating_point_type (type, stream); - else if (ada_is_modular_type (type)) - fprintf_filtered (stream, "mod %ld", (long) ada_modulus (type)); - else - { - fprintf_filtered (stream, "range "); - print_range (type, stream); - } - break; - case TYPE_CODE_FLT: - fprintf_filtered (stream, "<%d-byte float>", TYPE_LENGTH (type)); - break; - case TYPE_CODE_ENUM: - if (show < 0) - fprintf_filtered (stream, "(...)"); - else - print_enum_type (type, stream); - break; - case TYPE_CODE_STRUCT: - if (ada_is_array_descriptor (type)) + switch (TYPE_CODE (type)) + { + default: + fprintf_filtered (stream, "<"); + c_print_type (type, "", stream, show, level); + fprintf_filtered (stream, ">"); + break; + case TYPE_CODE_PTR: + fprintf_filtered (stream, "access "); + ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level); + break; + case TYPE_CODE_REF: + fprintf_filtered (stream, "<ref> "); + ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level); + break; + case TYPE_CODE_ARRAY: print_array_type (type, stream, show, level); - else if (ada_is_bogus_array_descriptor (type)) - fprintf_filtered (stream, "array (?) of ? (<mal-formed descriptor>)"); - else - print_record_type (type, stream, show, level); - break; - case TYPE_CODE_UNION: - print_unchecked_union_type (type, stream, show, level); - break; - case TYPE_CODE_FUNC: - print_func_type (type, stream, varstring); - break; - } + break; + case TYPE_CODE_INT: + if (ada_is_fixed_point_type (type)) + print_fixed_point_type (type, stream); + else if (ada_is_vax_floating_type (type)) + print_vax_floating_point_type (type, stream); + else + { + char *name = ada_type_name (type); + if (!ada_is_range_type_name (name)) + fprintf_filtered (stream, "<%d-byte integer>", + TYPE_LENGTH (type)); + else + { + fprintf_filtered (stream, "range "); + print_range_type_named (name, stream); + } + } + break; + case TYPE_CODE_RANGE: + if (ada_is_fixed_point_type (type)) + print_fixed_point_type (type, stream); + else if (ada_is_vax_floating_type (type)) + print_vax_floating_point_type (type, stream); + else if (ada_is_modular_type (type)) + fprintf_filtered (stream, "mod %ld", (long) ada_modulus (type)); + else + { + fprintf_filtered (stream, "range "); + print_range (type, stream); + } + break; + case TYPE_CODE_FLT: + fprintf_filtered (stream, "<%d-byte float>", TYPE_LENGTH (type)); + break; + case TYPE_CODE_ENUM: + if (show < 0) + fprintf_filtered (stream, "(...)"); + else + print_enum_type (type, stream); + break; + case TYPE_CODE_STRUCT: + if (ada_is_array_descriptor (type)) + print_array_type (type, stream, show, level); + else if (ada_is_bogus_array_descriptor (type)) + fprintf_filtered (stream, + "array (?) of ? (<mal-formed descriptor>)"); + else + print_record_type (type, stream, show, level); + break; + case TYPE_CODE_UNION: + print_unchecked_union_type (type, stream, show, level); + break; + case TYPE_CODE_FUNC: + print_func_type (type, stream, varstring); + break; + } } diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 3d651ed8310..fc2db703035 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -32,9 +32,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "c-lang.h" /* Encapsulates arguments to ada_val_print. */ -struct ada_val_print_args { - struct type* type; - char* valaddr0; +struct ada_val_print_args +{ + struct type *type; + char *valaddr0; int embedded_offset; CORE_ADDR address; struct ui_file *stream; @@ -47,45 +48,47 @@ struct ada_val_print_args { extern int inspect_it; extern unsigned int repeat_count_threshold; -static void print_record (struct type*, char*, struct ui_file*, int, +static void print_record (struct type *, char *, struct ui_file *, int, int, enum val_prettyprint); -static int print_field_values (struct type*, char*, struct ui_file*, +static int print_field_values (struct type *, char *, struct ui_file *, int, int, enum val_prettyprint, - int, struct type*, char*); + int, struct type *, char *); -static int print_variant_part (struct type*, int, char*, - struct ui_file*, int, int, enum val_prettyprint, - int, struct type*, char*); +static int print_variant_part (struct type *, int, char *, + struct ui_file *, int, int, + enum val_prettyprint, int, struct type *, + char *); -static void val_print_packed_array_elements (struct type*, char *valaddr, int, - struct ui_file*, int, int, +static void val_print_packed_array_elements (struct type *, char *valaddr, + int, struct ui_file *, int, int, enum val_prettyprint); -static void adjust_type_signedness (struct type*); +static void adjust_type_signedness (struct type *); static int ada_val_print_stub (PTR args0); -static int ada_val_print_1 (struct type*, char*, int, CORE_ADDR, struct ui_file*, - int, int, int, enum val_prettyprint); +static int ada_val_print_1 (struct type *, char *, int, CORE_ADDR, + struct ui_file *, int, int, int, + enum val_prettyprint); /* Make TYPE unsigned if its range of values includes no negatives. */ -static void +static void adjust_type_signedness (type) - struct type* type; + struct type *type; { - if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE + if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE && TYPE_LOW_BOUND (type) >= 0) TYPE_FLAGS (type) |= TYPE_FLAG_UNSIGNED; -} +} /* Assuming TYPE is a simple array type, prints its lower bound on STREAM, if non-standard (i.e., other than 1 for numbers, other than lower bound of index type for enumerated type). Returns 1 if something printed, otherwise 0. */ -static int +static int print_optional_low_bound (struct ui_file *stream, struct type *type) { struct type *index_type; @@ -96,27 +99,28 @@ print_optional_low_bound (struct ui_file *stream, struct type *type) if (index_type == NULL) return 0; - if (TYPE_CODE (index_type) == TYPE_CODE_RANGE) + if (TYPE_CODE (index_type) == TYPE_CODE_RANGE) { low_bound = TYPE_LOW_BOUND (index_type); index_type = TYPE_TARGET_TYPE (index_type); } else return 0; - - switch (TYPE_CODE (index_type)) { - case TYPE_CODE_ENUM: - if (low_bound == TYPE_FIELD_BITPOS (index_type, 0)) - return 0; - break; - case TYPE_CODE_UNDEF: - index_type = builtin_type_long; - /* FALL THROUGH */ - default: - if (low_bound == 1) - return 0; - break; - } + + switch (TYPE_CODE (index_type)) + { + case TYPE_CODE_ENUM: + if (low_bound == TYPE_FIELD_BITPOS (index_type, 0)) + return 0; + break; + case TYPE_CODE_UNDEF: + index_type = builtin_type_long; + /* FALL THROUGH */ + default: + if (low_bound == 1) + return 0; + break; + } ada_print_scalar (index_type, (LONGEST) low_bound, stream); fprintf_filtered (stream, " => "); @@ -128,7 +132,7 @@ print_optional_low_bound (struct ui_file *stream, struct type *type) BITOFFSET from VALADDR on STREAM. Formats according to FORMAT and separates with commas. RECURSE is the recursion (nesting) level. If PRETTY, uses "prettier" format. TYPE must have been decoded (as - by ada_coerce_to_simple_array). */ + by ada_coerce_to_simple_array). */ static void val_print_packed_array_elements (struct type *type, char *valaddr, @@ -147,8 +151,8 @@ val_print_packed_array_elements (struct type *type, char *valaddr, /* Number of repetitions we have detected so far. */ unsigned int reps; unsigned long bitsize = TYPE_FIELD_BITSIZE (type, 0); - struct value* mark = value_mark (); - + struct value *mark = value_mark (); + elttype = TYPE_TARGET_TYPE (type); eltlen = TYPE_LENGTH (check_typedef (elttype)); @@ -183,7 +187,7 @@ val_print_packed_array_elements (struct type *type, char *valaddr, wrap_here (n_spaces (2 + 2 * recurse)); i0 = i; - v0 = ada_value_primitive_packed_val (NULL, valaddr, + v0 = ada_value_primitive_packed_val (NULL, valaddr, (i0 * bitsize) / HOST_CHAR_BIT, (i0 * bitsize) % HOST_CHAR_BIT, bitsize, elttype); @@ -192,12 +196,11 @@ val_print_packed_array_elements (struct type *type, char *valaddr, i += 1; if (i >= len) break; - v1 = ada_value_primitive_packed_val (NULL, valaddr, + v1 = ada_value_primitive_packed_val (NULL, valaddr, (i * bitsize) / HOST_CHAR_BIT, (i * bitsize) % HOST_CHAR_BIT, bitsize, elttype); - if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen) - != 0) + if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen) != 0) break; } @@ -215,7 +218,7 @@ val_print_packed_array_elements (struct type *type, char *valaddr, int j; for (j = i0; j < i; j += 1) { - if (j > i0) + if (j > i0) { if (prettyprint_arrays) { @@ -244,8 +247,8 @@ val_print_packed_array_elements (struct type *type, char *valaddr, value_free_to_mark (mark); } -static struct type* -printable_val_type (struct type* type, char* valaddr) +static struct type * +printable_val_type (struct type *type, char *valaddr) { return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL); } @@ -270,19 +273,19 @@ ada_emit_char (int c, struct ui_file *stream, int quoter, int type_len) fprintf_filtered (stream, "%c", c); } else - fprintf_filtered (stream, "[\"%0*x\"]", type_len*2, c); + fprintf_filtered (stream, "[\"%0*x\"]", type_len * 2, c); } /* Character #I of STRING, given that TYPE_LEN is the size in bytes (1 or 2) of a character. */ static int -char_at (char* string, int i, int type_len) +char_at (char *string, int i, int type_len) { if (type_len == 1) return string[i]; - else - return (int) extract_unsigned_integer (string + 2*i, 2); + else + return (int) extract_unsigned_integer (string + 2 * i, 2); } void @@ -390,7 +393,7 @@ printstr (struct ui_file *stream, char *string, unsigned int length, for (i = 0; i < length && things_printed < print_max; i += 1) { /* Position of the character we are examining - to see whether it is repeated. */ + to see whether it is repeated. */ unsigned int rep1; /* Number of repetitions we have detected so far. */ unsigned int reps; @@ -405,8 +408,9 @@ printstr (struct ui_file *stream, char *string, unsigned int length, rep1 = i + 1; reps = 1; - while (rep1 < length && - char_at(string, rep1, type_len) == char_at (string, i, type_len)) + while (rep1 < length && + char_at (string, rep1, type_len) == char_at (string, i, + type_len)) { rep1 += 1; reps += 1; @@ -423,7 +427,8 @@ printstr (struct ui_file *stream, char *string, unsigned int length, in_quotes = 0; } fputs_filtered ("'", stream); - ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len); + ada_emit_char (char_at (string, i, type_len), stream, '\'', + type_len); fputs_filtered ("'", stream); fprintf_filtered (stream, " <repeats %u times>", reps); i = rep1 - 1; @@ -487,12 +492,13 @@ ada_printstr (struct ui_file *stream, char *string, unsigned int length, arrays.) */ int -ada_val_print (struct type* type, char* valaddr0, int embedded_offset, +ada_val_print (struct type *type, char *valaddr0, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int format, int deref_ref, int recurse, enum val_prettyprint pretty) { struct ada_val_print_args args; - args.type = type; args.valaddr0 = valaddr0; + args.type = type; + args.valaddr0 = valaddr0; args.embedded_offset = embedded_offset; args.address = address; args.stream = stream; @@ -509,18 +515,18 @@ ada_val_print (struct type* type, char* valaddr0, int embedded_offset, static int ada_val_print_stub (PTR args0) { - struct ada_val_print_args* argsp = (struct ada_val_print_args*) args0; - return ada_val_print_1 (argsp->type, argsp->valaddr0, argsp->embedded_offset, - argsp->address, argsp->stream, argsp->format, - argsp->deref_ref, argsp->recurse, - argsp->pretty); + struct ada_val_print_args *argsp = (struct ada_val_print_args *) args0; + return ada_val_print_1 (argsp->type, argsp->valaddr0, + argsp->embedded_offset, argsp->address, + argsp->stream, argsp->format, argsp->deref_ref, + argsp->recurse, argsp->pretty); } /* See the comment on ada_val_print. This function differs in that it * does not catch evaluation errors (leaving that to ada_val_print). */ static int -ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, +ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int format, int deref_ref, int recurse, enum val_prettyprint pretty) { @@ -530,15 +536,15 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, unsigned int eltlen; LONGEST val; CORE_ADDR addr; - char* valaddr = valaddr0 + embedded_offset; + char *valaddr = valaddr0 + embedded_offset; CHECK_TYPEDEF (type); if (ada_is_array_descriptor (type) || ada_is_packed_array_type (type)) { int retn; - struct value* mark = value_mark (); - struct value* val; + struct value *mark = value_mark (); + struct value *val; val = value_from_contents_and_address (type, valaddr, address); val = ada_coerce_to_simple_array_ptr (val); if (val == NULL) @@ -548,7 +554,7 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, } else retn = ada_val_print_1 (VALUE_TYPE (val), VALUE_CONTENTS (val), 0, - VALUE_ADDRESS (val), stream, format, + VALUE_ADDRESS (val), stream, format, deref_ref, recurse, pretty); value_free_to_mark (mark); return retn; @@ -561,7 +567,7 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, switch (TYPE_CODE (type)) { default: - return c_val_print (type, valaddr0, embedded_offset, address, stream, + return c_val_print (type, valaddr0, embedded_offset, address, stream, format, deref_ref, recurse, pretty); case TYPE_CODE_INT: @@ -577,26 +583,26 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, } else if (ada_is_vax_floating_type (type)) { - struct value* val = + struct value *val = value_from_contents_and_address (type, valaddr, address); - struct value* func = ada_vax_float_print_function (type); + struct value *func = ada_vax_float_print_function (type); if (func != 0) { - static struct type* parray_of_char = NULL; - struct value* printable_val; - - if (parray_of_char == NULL) - parray_of_char = - make_pointer_type - (create_array_type - (NULL, builtin_type_char, - create_range_type (NULL, builtin_type_int, 0, 32)), - NULL); - - printable_val = + static struct type *parray_of_char = NULL; + struct value *printable_val; + + if (parray_of_char == NULL) + parray_of_char = + make_pointer_type + (create_array_type + (NULL, builtin_type_char, + create_range_type (NULL, builtin_type_int, 0, 32)), NULL); + + printable_val = value_ind (value_cast (parray_of_char, - call_function_by_hand (func, 1, &val))); - + call_function_by_hand (func, 1, + &val))); + fprintf_filtered (stream, "%s", VALUE_CONTENTS (printable_val)); return 0; } @@ -604,26 +610,26 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, } else if (TYPE_CODE (type) == TYPE_CODE_RANGE) { - struct type* target_type = TYPE_TARGET_TYPE (type); + struct type *target_type = TYPE_TARGET_TYPE (type); if (TYPE_LENGTH (type) != TYPE_LENGTH (target_type)) { /* Obscure case of range type that has different length from - its base type. Perform a conversion, or we will get a - nonsense value. Actually, we could use the same - code regardless of lengths; I'm just avoiding a cast. */ - struct value* v = - value_cast (target_type, - value_from_contents_and_address (type, valaddr, 0)); + its base type. Perform a conversion, or we will get a + nonsense value. Actually, we could use the same + code regardless of lengths; I'm just avoiding a cast. */ + struct value *v = value_cast (target_type, + value_from_contents_and_address + (type, valaddr, 0)); return ada_val_print_1 (target_type, VALUE_CONTENTS (v), 0, 0, stream, format, 0, recurse + 1, pretty); } else - return ada_val_print_1 (TYPE_TARGET_TYPE (type), + return ada_val_print_1 (TYPE_TARGET_TYPE (type), valaddr0, embedded_offset, - address, stream, format, deref_ref, + address, stream, format, deref_ref, recurse, pretty); } - else + else { format = format ? format : output_format; if (format) @@ -661,8 +667,8 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, } if (i < len) { - const char* name = ada_enum_name (TYPE_FIELD_NAME (type, i)); - if (name[0] == '\'') + const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i)); + if (name[0] == '\'') fprintf_filtered (stream, "%ld %s", (long) val, name); else fputs_filtered (name, stream); @@ -672,18 +678,17 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, print_longest (stream, 'd', 0, val); } break; - + case TYPE_CODE_UNION: case TYPE_CODE_STRUCT: if (ada_is_bogus_array_descriptor (type)) { fprintf_filtered (stream, "(...?)"); return 0; - } + } else { - print_record (type, valaddr, stream, format, - recurse, pretty); + print_record (type, valaddr, stream, format, recurse, pretty); return 0; } @@ -693,21 +698,20 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, elttype = TYPE_TARGET_TYPE (type); eltlen = TYPE_LENGTH (elttype); len = TYPE_LENGTH (type) / eltlen; - + /* For an array of chars, print with string syntax. */ - if (ada_is_string_type (type) - && (format == 0 || format == 's')) + if (ada_is_string_type (type) && (format == 0 || format == 's')) { if (prettyprint_arrays) { print_spaces_filtered (2 + 2 * recurse, stream); } /* If requested, look for the first null char and only print - elements up to it. */ + elements up to it. */ if (stop_print_at_null) { int temp_len; - + /* Look for a NULL char. */ for (temp_len = 0; temp_len < len && temp_len < print_max @@ -715,7 +719,7 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, temp_len += 1); len = temp_len; } - + printstr (stream, valaddr, len, 0, eltlen); } else @@ -723,10 +727,9 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, len = 0; fprintf_filtered (stream, "("); print_optional_low_bound (stream, type); - if (TYPE_FIELD_BITSIZE (type, 0) > 0) + if (TYPE_FIELD_BITSIZE (type, 0) > 0) val_print_packed_array_elements (type, valaddr, 0, stream, - format, recurse, - pretty); + format, recurse, pretty); else val_print_array_elements (type, valaddr, address, stream, format, deref_ref, recurse, @@ -740,27 +743,27 @@ ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset, case TYPE_CODE_REF: elttype = check_typedef (TYPE_TARGET_TYPE (type)); if (addressprint) - { + { fprintf_filtered (stream, "@"); print_address_numeric (extract_address (valaddr, TARGET_PTR_BIT / HOST_CHAR_BIT), 1, stream); if (deref_ref) fputs_filtered (": ", stream); - } + } /* De-reference the reference */ if (deref_ref) { if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF) { - LONGEST deref_val_int = (LONGEST) - unpack_pointer (lookup_pointer_type (builtin_type_void), + LONGEST deref_val_int = (LONGEST) + unpack_pointer (lookup_pointer_type (builtin_type_void), valaddr); - if (deref_val_int != 0) + if (deref_val_int != 0) { - struct value* deref_val = - ada_value_ind (value_from_longest - (lookup_pointer_type (elttype), + struct value *deref_val = + ada_value_ind (value_from_longest + (lookup_pointer_type (elttype), deref_val_int)); val_print (VALUE_TYPE (deref_val), VALUE_CONTENTS (deref_val), 0, @@ -785,13 +788,12 @@ print_variant_part (struct type *type, int field_num, char *valaddr, struct type *outer_type, char *outer_valaddr) { struct type *var_type = TYPE_FIELD_TYPE (type, field_num); - int which = - ada_which_variant_applies (var_type, outer_type, outer_valaddr); + int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr); if (which < 0) return 0; else - return print_field_values + return print_field_values (TYPE_FIELD_TYPE (var_type, which), valaddr + TYPE_FIELD_BITPOS (type, field_num) / HOST_CHAR_BIT + TYPE_FIELD_BITPOS (var_type, which) / HOST_CHAR_BIT, @@ -800,23 +802,23 @@ print_variant_part (struct type *type, int field_num, char *valaddr, } int -ada_value_print (struct value* val0, struct ui_file *stream, int format, +ada_value_print (struct value *val0, struct ui_file *stream, int format, enum val_prettyprint pretty) { - char* valaddr = VALUE_CONTENTS (val0); + char *valaddr = VALUE_CONTENTS (val0); CORE_ADDR address = VALUE_ADDRESS (val0) + VALUE_OFFSET (val0); - struct type* type = + struct type *type = ada_to_fixed_type (VALUE_TYPE (val0), valaddr, address, NULL); - struct value* val = value_from_contents_and_address (type, valaddr, address); + struct value *val = + value_from_contents_and_address (type, valaddr, address); /* If it is a pointer, indicate what it points to. */ - if (TYPE_CODE (type) == TYPE_CODE_PTR || - TYPE_CODE (type) == TYPE_CODE_REF) + if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_CODE (type) == TYPE_CODE_REF) { /* Hack: remove (char *) for char strings. Their - type is indicated by the quoted string anyway. */ + type is indicated by the quoted string anyway. */ if (TYPE_CODE (type) == TYPE_CODE_PTR && - TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == sizeof(char) && + TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == sizeof (char) && TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_INT && !TYPE_UNSIGNED (TYPE_TARGET_TYPE (type))) { @@ -829,7 +831,7 @@ ada_value_print (struct value* val0, struct ui_file *stream, int format, fprintf_filtered (stream, ") "); } } - else if (ada_is_array_descriptor (type)) + else if (ada_is_array_descriptor (type)) { fprintf_filtered (stream, "("); type_print (type, "", stream, -1); @@ -842,10 +844,10 @@ ada_value_print (struct value* val0, struct ui_file *stream, int format, fprintf_filtered (stream, ") (...?)"); return 0; } - return (val_print (type, VALUE_CONTENTS (val), 0, address, + return (val_print (type, VALUE_CONTENTS (val), 0, address, stream, format, 1, 0, pretty)); } - + static void print_record (struct type *type, char *valaddr, struct ui_file *stream, int format, int recurse, enum val_prettyprint pretty) @@ -855,8 +857,7 @@ print_record (struct type *type, char *valaddr, struct ui_file *stream, fprintf_filtered (stream, "("); if (print_field_values (type, valaddr, stream, format, recurse, pretty, - 0, type, valaddr) != 0 - && pretty) + 0, type, valaddr) != 0 && pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -892,13 +893,13 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream, for (i = 0; i < len; i += 1) { if (ada_is_ignored_field (type, i)) - continue; + continue; if (ada_is_wrapper_field (type, i)) { - comma_needed = + comma_needed = print_field_values (TYPE_FIELD_TYPE (type, i), - valaddr + valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT, stream, format, recurse, pretty, comma_needed, type, valaddr); @@ -922,7 +923,7 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream, fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); } - else + else { wrap_here (n_spaces (2 + 2 * recurse)); } @@ -942,7 +943,7 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream, else { annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - fprintf_filtered (stream, "%.*s", + fprintf_filtered (stream, "%.*s", ada_name_prefix_len (TYPE_FIELD_NAME (type, i)), TYPE_FIELD_NAME (type, i)); annotate_field_name_end (); @@ -952,7 +953,7 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream, if (TYPE_FIELD_PACKED (type, i)) { - struct value* v; + struct value *v; /* Bitfields require special handling, especially due to byte order problems. */ @@ -965,21 +966,21 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream, { int bit_pos = TYPE_FIELD_BITPOS (type, i); int bit_size = TYPE_FIELD_BITSIZE (type, i); - + adjust_type_signedness (TYPE_FIELD_TYPE (type, i)); v = ada_value_primitive_packed_val (NULL, valaddr, bit_pos / HOST_CHAR_BIT, bit_pos % HOST_CHAR_BIT, - bit_size, + bit_size, TYPE_FIELD_TYPE (type, i)); - val_print (TYPE_FIELD_TYPE(type, i), VALUE_CONTENTS (v), 0, 0, + val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0, stream, format, 0, recurse + 1, pretty); } } else - ada_val_print (TYPE_FIELD_TYPE (type, i), - valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT, - 0, 0, stream, format, 0, recurse + 1, pretty); + ada_val_print (TYPE_FIELD_TYPE (type, i), + valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT, + 0, 0, stream, format, 0, recurse + 1, pretty); annotate_field_end (); } |