-/* Ada language support routines for GDB, the GNU debugger. Copyright
- 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004.
+/* Ada language support routines for GDB, the GNU debugger. Copyright (C)
+
+ 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2007
Free Software Foundation, Inc.
This file is part of GDB.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-
-/* Sections of code marked
-
- #ifdef GNAT_GDB
- ...
- #endif
+Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
- indicate sections that are used in sources distributed by
- ACT, Inc., but not yet integrated into the public tree (where
- GNAT_GDB is not defined). They are retained here nevertheless
- to minimize the problems of maintaining different versions
- of the source and to make the full source available. */
#include "defs.h"
#include <stdio.h>
#include "block.h"
#include "infcall.h"
#include "dictionary.h"
+#include "exceptions.h"
+#include "annotate.h"
+#include "valprint.h"
+#include "source.h"
+#include "observer.h"
#ifndef ADA_RETAIN_DOTS
#define ADA_RETAIN_DOTS 0
#define TRUNCATION_TOWARDS_ZERO ((-5 / 2) == -2)
#endif
-#ifdef GNAT_GDB
-/* A structure that contains a vector of strings.
- The main purpose of this type is to group the vector and its
- associated parameters in one structure. This makes it easier
- to handle and pass around. */
-
-struct string_vector
-{
- char **array; /* The vector itself. */
- int index; /* Index of the next available element in the array. */
- size_t size; /* The number of entries allocated in the array. */
-};
-
-static struct string_vector xnew_string_vector (int initial_size);
-static void string_vector_append (struct string_vector *sv, char *str);
-#endif /* GNAT_GDB */
-static const char *ada_unqualified_name (const char *decoded_name);
-static char *add_angle_brackets (const char *str);
static void extract_string (CORE_ADDR addr, char *buf);
-static char *function_name_from_pc (CORE_ADDR pc);
static struct type *ada_create_fundamental_type (struct objfile *, int);
CORE_ADDR *);
static void ada_add_block_symbols (struct obstack *,
- struct block *, const char *,
+ struct block *, const char *,
domain_enum, struct objfile *,
- struct symtab *, int);
+ struct symtab *, int);
static int is_nonfunction (struct ada_symbol_info *, int);
-static void add_defn_to_vec (struct obstack *, struct symbol *, struct block *,
- struct symtab *);
+static void add_defn_to_vec (struct obstack *, struct symbol *,
+ struct block *, struct symtab *);
static int num_defns_collected (struct obstack *);
static struct ada_symbol_info *defns_collected (struct obstack *, int);
static struct partial_symbol *ada_lookup_partial_symbol (struct partial_symtab
- *, const char *, int,
- domain_enum, int);
+ *, const char *, int,
+ domain_enum, int);
static struct symtab *symtab_for_sym (struct symbol *);
static struct value *resolve_subexp (struct expression **, int *, int,
- struct type *);
+ struct type *);
static void replace_operator_with_call (struct expression **, int, int, int,
struct symbol *, struct block *);
static int discrete_type_p (struct type *);
static struct type *ada_lookup_struct_elt_type (struct type *, char *,
- int, int, int *);
-
-static char *extended_canonical_line_spec (struct symtab_and_line,
- const char *);
+ int, int, int *);
static struct value *evaluate_subexp (struct type *, struct expression *,
int *, enum noside);
static struct value *evaluate_subexp_type (struct expression *, int *);
-static struct type *ada_create_fundamental_type (struct objfile *, int);
-
static int is_dynamic_field (struct type *, int);
-static struct type *to_fixed_variant_branch_type (struct type *, char *,
+static struct type *to_fixed_variant_branch_type (struct type *,
+ const gdb_byte *,
CORE_ADDR, struct value *);
static struct type *to_fixed_array_type (struct type *, struct value *, int);
static struct value *value_subscript_packed (struct value *, int,
struct value **);
+static void move_bits (gdb_byte *, int, const gdb_byte *, int, int);
+
static struct value *coerce_unspec_val_to_type (struct value *,
struct type *);
static int wild_match (const char *, int, const char *);
-static struct symtabs_and_lines
-find_sal_from_funcs_and_line (const char *, int,
- struct ada_symbol_info *, int);
-
-static int find_line_in_linetable (struct linetable *, int,
- struct ada_symbol_info *,
- int, int *);
-
-static int find_next_line_in_linetable (struct linetable *, int, int, int);
-
-static void read_all_symtabs (const char *);
-
-static int is_plausible_func_for_line (struct symbol *, int);
-
static struct value *ada_coerce_ref (struct value *);
static LONGEST pos_atr (struct value *);
static struct symbol *standard_lookup (const char *, const struct block *,
domain_enum);
-extern void symtab_symbol_info (char *regexp, domain_enum kind,
- int from_tty);
-
static struct value *ada_search_struct_field (char *, struct value *, int,
struct type *);
static struct value *ada_value_primitive_field (struct value *, int, int,
struct type *);
-static int find_struct_field (char *, struct type *, int,
- struct type **, int *, int *, int *);
+static int find_struct_field (char *, struct type *, int,
+ struct type **, int *, int *, int *, int *);
static struct value *ada_to_fixed_value_create (struct type *, CORE_ADDR,
struct value *);
static struct value *ada_to_fixed_value (struct value *);
-static void adjust_pc_past_prologue (CORE_ADDR *);
-
static int ada_resolve_function (struct ada_symbol_info *, int,
struct value **, int, const char *,
struct type *);
static int ada_is_direct_array_type (struct type *);
-static void error_breakpoint_runtime_sym_not_found (const char *err_desc);
+static void ada_language_arch_info (struct gdbarch *,
+ struct language_arch_info *);
+
+static void check_size (const struct type *);
+
+static struct value *ada_index_struct_field (int, struct value *, int,
+ struct type *);
+
+static struct value *assign_aggregate (struct value *, struct value *,
+ struct expression *, int *, enum noside);
+
+static void aggregate_assign_from_choices (struct value *, struct value *,
+ struct expression *,
+ int *, LONGEST *, int *,
+ int, LONGEST, LONGEST);
+
+static void aggregate_assign_positional (struct value *, struct value *,
+ struct expression *,
+ int *, LONGEST *, int *, int,
+ LONGEST, LONGEST);
-static int is_runtime_sym_defined (const char *name, int allow_tramp);
+static void aggregate_assign_others (struct value *, struct value *,
+ struct expression *,
+ int *, LONGEST *, int, LONGEST, LONGEST);
+
+
+static void add_component_interval (LONGEST, LONGEST, LONGEST *, int *, int);
+
+
+static struct value *ada_evaluate_subexp (struct type *, struct expression *,
+ int *, enum noside);
+
+static void ada_forward_operator_length (struct expression *, int, int *,
+ int *);
\f
+
/* Maximum-sized dynamic type. */
static unsigned int varsize_limit;
#endif
/* The name of the symbol to use to get the name of the main subprogram. */
-static const char ADA_MAIN_PROGRAM_SYMBOL_NAME[]
+static const char ADA_MAIN_PROGRAM_SYMBOL_NAME[]
= "__gnat_ada_main_program_name";
-/* The name of the runtime function called when an exception is raised. */
-static const char raise_sym_name[] = "__gnat_raise_nodefer_with_msg";
-
-/* The name of the runtime function called when an unhandled exception
- is raised. */
-static const char raise_unhandled_sym_name[] = "__gnat_unhandled_exception";
-
-/* The name of the runtime function called when an assert failure is
- raised. */
-static const char raise_assert_sym_name[] =
- "system__assertions__raise_assert_failure";
-
-/* When GDB stops on an unhandled exception, GDB will go up the stack until
- if finds a frame corresponding to this function, in order to extract the
- name of the exception that has been raised from one of the parameters. */
-static const char process_raise_exception_name[] =
- "ada__exceptions__process_raise_exception";
-
-/* A string that reflects the longest exception expression rewrite,
- aside from the exception name. */
-static const char longest_exception_template[] =
- "'__gnat_raise_nodefer_with_msg' if long_integer(e) = long_integer(&)";
-
/* Limit on the number of warnings to raise per expression evaluation. */
static int warning_limit = 2;
/* Utilities */
-#ifdef GNAT_GDB
-
-/* Create a new empty string_vector struct with an initial size of
- INITIAL_SIZE. */
-
-static struct string_vector
-xnew_string_vector (int initial_size)
-{
- struct string_vector result;
-
- result.array = (char **) xmalloc ((initial_size + 1) * sizeof (char *));
- result.index = 0;
- result.size = initial_size;
-
- return result;
-}
-
-/* Add STR at the end of the given string vector SV. If SV is already
- full, its size is automatically increased (doubled). */
-
-static void
-string_vector_append (struct string_vector *sv, char *str)
-{
- if (sv->index >= sv->size)
- GROW_VECT (sv->array, sv->size, sv->size * 2);
-
- sv->array[sv->index] = str;
- sv->index++;
-}
-
-/* Given DECODED_NAME a string holding a symbol name in its
- decoded form (ie using the Ada dotted notation), returns
- its unqualified name. */
-
-static const char *
-ada_unqualified_name (const char *decoded_name)
-{
- const char *result = strrchr (decoded_name, '.');
-
- if (result != NULL)
- result++; /* Skip the dot... */
- else
- result = decoded_name;
-
- return result;
-}
-
-/* Return a string starting with '<', followed by STR, and '>'.
- The result is good until the next call. */
static char *
-add_angle_brackets (const char *str)
+ada_get_gdb_completer_word_break_characters (void)
{
- static char *result = NULL;
-
- xfree (result);
- result = (char *) xmalloc ((strlen (str) + 3) * sizeof (char));
-
- sprintf (result, "<%s>", str);
- return result;
+ return ada_completer_word_break_characters;
}
-#endif /* GNAT_GDB */
+/* Print an array element index using the Ada syntax. */
-static char *
-ada_get_gdb_completer_word_break_characters (void)
+static void
+ada_print_array_index (struct value *index_value, struct ui_file *stream,
+ int format, enum val_prettyprint pretty)
{
- return ada_completer_word_break_characters;
+ LA_VALUE_PRINT (index_value, stream, format, pretty);
+ fprintf_filtered (stream, " => ");
}
/* Read the string located at ADDR from the inferior and store the
while (buf[char_index - 1] != '\000');
}
-/* Return the name of the function owning the instruction located at PC.
- Return NULL if no such function could be found. */
-
-static char *
-function_name_from_pc (CORE_ADDR pc)
-{
- char *func_name;
-
- if (!find_pc_partial_function (pc, &func_name, NULL, NULL))
- return NULL;
-
- return func_name;
-}
-
-/* Assuming *OLD_VECT points to an array of *SIZE objects of size
+/* Assuming VECT points to an array of *SIZE objects of size
ELEMENT_SIZE, grow it to contain at least MIN_SIZE objects,
- updating *OLD_VECT and *SIZE as necessary. */
+ updating *SIZE as necessary and returning the (new) array. */
-void
-grow_vect (void **old_vect, size_t * size, size_t min_size, int element_size)
+void *
+grow_vect (void *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);
+ vect = xrealloc (vect, *size * element_size);
}
+ return vect;
}
/* True (non-zero) iff TARGET matches FIELD_NAME up to any trailing
(strncmp (field_name, target, len) == 0
&& (field_name[len] == '\0'
|| (strncmp (field_name + len, "___", 3) == 0
- && strcmp (field_name + strlen (field_name) - 6, "___XVN") != 0)));
+ && strcmp (field_name + strlen (field_name) - 6,
+ "___XVN") != 0)));
}
return fieldno;
if (!maybe_missing)
- error ("Unable to find field %s in struct %s. Aborting",
+ error (_("Unable to find field %s in struct %s. Aborting"),
field_name, TYPE_NAME (type));
return -1;
ADDRESS. */
struct value *
-value_from_contents_and_address (struct type *type, char *valaddr,
+value_from_contents_and_address (struct type *type,
+ const gdb_byte *valaddr,
CORE_ADDR address)
{
struct value *v = allocate_value (type);
if (valaddr == NULL)
- VALUE_LAZY (v) = 1;
+ set_value_lazy (v, 1);
else
- memcpy (VALUE_CONTENTS_RAW (v), valaddr, TYPE_LENGTH (type));
+ memcpy (value_contents_raw (v), valaddr, TYPE_LENGTH (type));
VALUE_ADDRESS (v) = address;
if (address != 0)
VALUE_LVAL (v) = lval_memory;
static struct value *
coerce_unspec_val_to_type (struct value *val, struct type *type)
{
- CHECK_TYPEDEF (type);
- if (VALUE_TYPE (val) == type)
+ type = ada_check_typedef (type);
+ if (value_type (val) == type)
return val;
else
{
/* Make sure that the object size is not unreasonable before
trying to allocate some memory for it. */
- if (TYPE_LENGTH (type) > varsize_limit)
- error ("object size is larger than varsize-limit");
+ check_size (type);
result = allocate_value (type);
VALUE_LVAL (result) = VALUE_LVAL (val);
- VALUE_BITSIZE (result) = VALUE_BITSIZE (val);
- VALUE_BITPOS (result) = VALUE_BITPOS (val);
- VALUE_ADDRESS (result) = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
- if (VALUE_LAZY (val) ||
- TYPE_LENGTH (type) > TYPE_LENGTH (VALUE_TYPE (val)))
- VALUE_LAZY (result) = 1;
+ set_value_bitsize (result, value_bitsize (val));
+ set_value_bitpos (result, value_bitpos (val));
+ VALUE_ADDRESS (result) = VALUE_ADDRESS (val) + value_offset (val);
+ if (value_lazy (val)
+ || TYPE_LENGTH (type) > TYPE_LENGTH (value_type (val)))
+ set_value_lazy (result, 1);
else
- memcpy (VALUE_CONTENTS_RAW (result), VALUE_CONTENTS (val),
+ memcpy (value_contents_raw (result), value_contents (val),
TYPE_LENGTH (type));
return result;
}
}
-static char *
-cond_offset_host (char *valaddr, long offset)
+static const gdb_byte *
+cond_offset_host (const gdb_byte *valaddr, long offset)
{
if (valaddr == NULL)
return NULL;
with exactly one argument rather than ...), unless the limit on the
number of warnings has passed during the evaluation of the current
expression. */
+
+/* FIXME: cagney/2004-10-10: This function is mimicking the behavior
+ provided by "complaint". */
+static void lim_warning (const char *format, ...) ATTR_FORMAT (printf, 1, 2);
+
static void
-lim_warning (const char *format, long arg)
+lim_warning (const char *format, ...)
{
+ va_list args;
+ va_start (args, format);
+
warnings_issued += 1;
if (warnings_issued <= warning_limit)
- warning (format, arg);
+ vwarning (format, args);
+
+ va_end (args);
}
-static const char *
-ada_translate_error_message (const char *string)
+/* Issue an error if the size of an object of type T is unreasonable,
+ i.e. if it would be a bad idea to allocate a value of this type in
+ GDB. */
+
+static void
+check_size (const struct type *type)
{
- if (strcmp (string, "Invalid cast.") == 0)
- return "Invalid type conversion.";
- else
- return string;
+ if (TYPE_LENGTH (type) > varsize_limit)
+ error (_("object size is larger than varsize-limit"));
}
+
+/* Note: would have used MAX_OF_TYPE and MIN_OF_TYPE macros from
+ gdbtypes.h, but some of the necessary definitions in that file
+ seem to have gone missing. */
+
+/* Maximum value of a SIZE-byte signed integer type. */
static LONGEST
-MAX_OF_SIZE (int size)
+max_of_size (int size)
{
- LONGEST top_bit = (LONGEST) 1 << (size*8-2);
- return top_bit | (top_bit-1);
+ LONGEST top_bit = (LONGEST) 1 << (size * 8 - 2);
+ return top_bit | (top_bit - 1);
}
+/* Minimum value of a SIZE-byte signed integer type. */
static LONGEST
-MIN_OF_SIZE (int size)
+min_of_size (int size)
{
- return - MAX_OF_SIZE (size) - 1;
+ return -max_of_size (size) - 1;
}
+/* Maximum value of a SIZE-byte unsigned integer type. */
static ULONGEST
-UMAX_OF_SIZE (int size)
+umax_of_size (int size)
{
- ULONGEST top_bit = (ULONGEST) 1 << (size*8-1);
- return top_bit | (top_bit-1);
+ ULONGEST top_bit = (ULONGEST) 1 << (size * 8 - 1);
+ return top_bit | (top_bit - 1);
}
-static ULONGEST
-UMIN_OF_SIZE (int size)
+/* Maximum value of integral type T, as a signed quantity. */
+static LONGEST
+max_of_type (struct type *t)
{
- return 0;
+ if (TYPE_UNSIGNED (t))
+ return (LONGEST) umax_of_size (TYPE_LENGTH (t));
+ else
+ return max_of_size (TYPE_LENGTH (t));
+}
+
+/* Minimum value of integral type T, as a signed quantity. */
+static LONGEST
+min_of_type (struct type *t)
+{
+ if (TYPE_UNSIGNED (t))
+ return 0;
+ else
+ return min_of_size (TYPE_LENGTH (t));
}
/* The largest value in the domain of TYPE, a discrete type, as an integer. */
static struct value *
discrete_type_high_bound (struct type *type)
{
- switch (TYPE_CODE (type))
+ switch (TYPE_CODE (type))
{
case TYPE_CODE_RANGE:
return value_from_longest (TYPE_TARGET_TYPE (type),
- TYPE_HIGH_BOUND (type));
+ TYPE_HIGH_BOUND (type));
case TYPE_CODE_ENUM:
- return
- value_from_longest (type,
- TYPE_FIELD_BITPOS (type, TYPE_NFIELDS (type)-1));
- case TYPE_CODE_INT:
- return value_from_longest (type, MAX_OF_TYPE (type));
+ return
+ value_from_longest (type,
+ TYPE_FIELD_BITPOS (type,
+ TYPE_NFIELDS (type) - 1));
+ case TYPE_CODE_INT:
+ return value_from_longest (type, max_of_type (type));
default:
- error ("Unexpected type in discrete_type_high_bound.");
+ error (_("Unexpected type in discrete_type_high_bound."));
}
}
static struct value *
discrete_type_low_bound (struct type *type)
{
- switch (TYPE_CODE (type))
+ switch (TYPE_CODE (type))
{
case TYPE_CODE_RANGE:
return value_from_longest (TYPE_TARGET_TYPE (type),
- TYPE_LOW_BOUND (type));
+ TYPE_LOW_BOUND (type));
case TYPE_CODE_ENUM:
- return value_from_longest (type, TYPE_FIELD_BITPOS (type, 0));
- case TYPE_CODE_INT:
- return value_from_longest (type, MIN_OF_TYPE (type));
+ return value_from_longest (type, TYPE_FIELD_BITPOS (type, 0));
+ case TYPE_CODE_INT:
+ return value_from_longest (type, min_of_type (type));
default:
- error ("Unexpected type in discrete_type_low_bound.");
+ error (_("Unexpected type in discrete_type_low_bound."));
}
}
/* The identity on non-range types. For range types, the underlying
- non-range scalar type. */
+ non-range scalar type. */
static struct type *
base_type (struct type *type)
{
while (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE)
{
- if (type == TYPE_TARGET_TYPE (type)
- || TYPE_TARGET_TYPE (type) == NULL)
- return type;
+ if (type == TYPE_TARGET_TYPE (type) || TYPE_TARGET_TYPE (type) == NULL)
+ return type;
type = TYPE_TARGET_TYPE (type);
}
return type;
}
-
\f
+
/* Language Selection */
/* If the main program is in Ada, return language_ada, otherwise return LANG
struct minimal_symbol *msym;
CORE_ADDR main_program_name_addr;
static char main_program_name[1024];
+
/* For Ada, the name of the main procedure is stored in a specific
string constant, generated by the binder. Look for that symbol,
extract its address, and then read that string. If we didn't find
{
main_program_name_addr = SYMBOL_VALUE_ADDRESS (msym);
if (main_program_name_addr == 0)
- error ("Invalid address for Ada main program name.");
+ error (_("Invalid address for Ada main program name."));
extract_string (main_program_name_addr, main_program_name);
return main_program_name;
const struct ada_opname_map *mapping;
for (mapping = ada_opname_table;
- mapping->encoded != NULL &&
- strncmp (mapping->decoded, p,
- strlen (mapping->decoded)) != 0;
- mapping += 1)
+ mapping->encoded != NULL
+ && strncmp (mapping->decoded, p,
+ strlen (mapping->decoded)) != 0; mapping += 1)
;
if (mapping->encoded == NULL)
- error ("invalid Ada operator name: %s", p);
+ error (_("invalid Ada operator name: %s"), p);
strcpy (encoding_buffer + k, mapping->encoded);
k += strlen (mapping->encoded);
break;
return fold_buffer;
}
-/* decode:
- 0. Discard trailing .{DIGIT}+ or trailing ___{DIGIT}+
+/* Return nonzero if C is either a digit or a lowercase alphabet character. */
+
+static int
+is_lower_alphanum (const char c)
+{
+ return (isdigit (c) || (isalpha (c) && islower (c)));
+}
+
+/* Decode:
+ . Discard trailing .{DIGIT}+, ${DIGIT}+ or ___{DIGIT}+
These are suffixes introduced by GNAT5 to nested subprogram
names, and do not serve any purpose for the debugger.
- 1. Discard final __{DIGIT}+ or $({DIGIT}+(__{DIGIT}+)*)
- 2. Convert other instances of embedded "__" to `.'.
- 3. Discard leading _ada_.
- 4. Convert operator names to the appropriate quoted symbols.
- 5. Remove everything after first ___ if it is followed by
+ . Discard final __{DIGIT}+ or $({DIGIT}+(__{DIGIT}+)*)
+ . Discard final N if it follows a lowercase alphanumeric character
+ (protected object subprogram suffix)
+ . Convert other instances of embedded "__" to `.'.
+ . Discard leading _ada_.
+ . Convert operator names to the appropriate quoted symbols.
+ . Remove everything after first ___ if it is followed by
'X'.
- 6. Replace TK__ with __, and a trailing B or TKB with nothing.
- 7. Put symbols that should be suppressed in <...> brackets.
- 8. Remove trailing X[bn]* suffix (indicating names in package bodies).
+ . Replace TK__ with __, and a trailing B or TKB with nothing.
+ . Replace _[EB]{DIGIT}+[sb] with nothing (protected object entries)
+ . Put symbols that should be suppressed in <...> brackets.
+ . Remove trailing X[bn]* suffix (indicating names in package bodies).
The resulting string is valid until the next call of ada_decode.
If the string is unchanged by demangling, the original string pointer
if (encoded[0] == '_' || encoded[0] == '<')
goto Suppress;
- /* Remove trailing .{DIGIT}+ or ___{DIGIT}+. */
+ /* Remove trailing .{DIGIT}+ or ___{DIGIT}+ or __{DIGIT}+. */
len0 = strlen (encoded);
if (len0 > 1 && isdigit (encoded[len0 - 1]))
{
i--;
if (i >= 0 && encoded[i] == '.')
len0 = i;
+ else if (i >= 0 && encoded[i] == '$')
+ len0 = i;
else if (i >= 2 && strncmp (encoded + i - 2, "___", 3) == 0)
len0 = i - 2;
+ else if (i >= 1 && strncmp (encoded + i - 1, "__", 2) == 0)
+ len0 = i - 1;
}
+ /* Remove trailing N. */
+
+ /* Protected entry subprograms are broken into two
+ separate subprograms: The first one is unprotected, and has
+ a 'N' suffix; the second is the protected version, and has
+ the 'P' suffix. The second calls the first one after handling
+ the protection. Since the P subprograms are internally generated,
+ we leave these names undecoded, giving the user a clue that this
+ entity is internal. */
+
+ if (len0 > 1
+ && encoded[len0 - 1] == 'N'
+ && (isdigit (encoded[len0 - 2]) || islower (encoded[len0 - 2])))
+ len0--;
+
/* Remove the ___X.* suffix if present. Do not forget to verify that
the suffix is located before the current "end" of ENCODED. We want
to avoid re-matching parts of ENCODED that have previously been
if (len0 > 3 && strncmp (encoded + len0 - 3, "TKB", 3) == 0)
len0 -= 3;
-
+
if (len0 > 1 && strncmp (encoded + len0 - 1, "B", 1) == 0)
len0 -= 1;
for (k = 0; ada_opname_table[k].encoded != NULL; k += 1)
{
int op_len = strlen (ada_opname_table[k].encoded);
- if (strncmp (ada_opname_table[k].encoded + 1, encoded + i + 1,
- op_len - 1) == 0
+ if ((strncmp (ada_opname_table[k].encoded + 1, encoded + i + 1,
+ op_len - 1) == 0)
&& !isalnum (encoded[i + op_len]))
{
strcpy (decoded + j, ada_opname_table[k].decoded);
}
at_start_name = 0;
+ /* Replace "TK__" with "__", which will eventually be translated
+ into "." (just below). */
+
if (i < len0 - 4 && strncmp (encoded + i, "TK__", 4) == 0)
i += 2;
+
+ /* Remove _E{DIGITS}+[sb] */
+
+ /* Just as for protected object subprograms, there are 2 categories
+ of subprograms created by the compiler for each entry. The first
+ one implements the actual entry code, and has a suffix following
+ the convention above; the second one implements the barrier and
+ uses the same convention as above, except that the 'E' is replaced
+ by a 'B'.
+
+ Just as above, we do not decode the name of barrier functions
+ to give the user a clue that the code he is debugging has been
+ internally generated. */
+
+ if (len0 - i > 3 && encoded [i] == '_' && encoded[i+1] == 'E'
+ && isdigit (encoded[i+2]))
+ {
+ int k = i + 3;
+
+ while (k < len0 && isdigit (encoded[k]))
+ k++;
+
+ if (k < len0
+ && (encoded[k] == 'b' || encoded[k] == 's'))
+ {
+ k++;
+ /* Just as an extra precaution, make sure that if this
+ suffix is followed by anything else, it is a '_'.
+ Otherwise, we matched this sequence by accident. */
+ if (k == len0
+ || (k < len0 && encoded[k] == '_'))
+ i = k;
+ }
+ }
+
+ /* Remove trailing "N" in [a-z0-9]+N__. The N is added by
+ the GNAT front-end in protected object subprograms. */
+
+ if (i < len0 + 3
+ && encoded[i] == 'N' && encoded[i+1] == '_' && encoded[i+2] == '_')
+ {
+ /* Backtrack a bit up until we reach either the begining of
+ the encoded name, or "__". Make sure that we only find
+ digits or lowercase characters. */
+ const char *ptr = encoded + i - 1;
+
+ while (ptr >= encoded && is_lower_alphanum (ptr[0]))
+ ptr--;
+ if (ptr < encoded
+ || (ptr > encoded && ptr[0] == '_' && ptr[-1] == '_'))
+ i++;
+ }
+
if (encoded[i] == 'X' && i != 0 && isalnum (encoded[i - 1]))
{
do
The GSYMBOL parameter is "mutable" in the C++ sense: logically
const, but nevertheless modified to a semantically equivalent form
when a decoded name is cached in it.
-*/
+*/
-char *ada_decode_symbol (const struct general_symbol_info *gsymbol)
+char *
+ada_decode_symbol (const struct general_symbol_info *gsymbol)
{
- char **resultp =
+ char **resultp =
(char **) &gsymbol->language_specific.cplus_specific.demangled_name;
if (*resultp == NULL)
{
const char *decoded = ada_decode (gsymbol->name);
if (gsymbol->bfd_section != NULL)
- {
- bfd *obfd = gsymbol->bfd_section->owner;
- if (obfd != NULL)
- {
- struct objfile *objf;
- ALL_OBJFILES (objf)
- {
- if (obfd == objf->obfd)
- {
- *resultp = obsavestring (decoded, strlen (decoded),
- &objf->objfile_obstack);
- break;
- }
- }
- }
- }
+ {
+ bfd *obfd = gsymbol->bfd_section->owner;
+ if (obfd != NULL)
+ {
+ struct objfile *objf;
+ ALL_OBJFILES (objf)
+ {
+ if (obfd == objf->obfd)
+ {
+ *resultp = obsavestring (decoded, strlen (decoded),
+ &objf->objfile_obstack);
+ break;
+ }
+ }
+ }
+ }
/* Sometimes, we can't find a corresponding objfile, in which
- case, we put the result on the heap. Since we only decode
- when needed, we hope this usually does not cause a
- significant memory leak (FIXME). */
+ case, we put the result on the heap. Since we only decode
+ when needed, we hope this usually does not cause a
+ significant memory leak (FIXME). */
if (*resultp == NULL)
- {
- char **slot =
- (char **) htab_find_slot (decoded_names_store,
- decoded, INSERT);
- if (*slot == NULL)
- *slot = xstrdup (decoded);
- *resultp = *slot;
- }
+ {
+ char **slot = (char **) htab_find_slot (decoded_names_store,
+ decoded, INSERT);
+ if (*slot == NULL)
+ *slot = xstrdup (decoded);
+ *resultp = *slot;
+ }
}
return *resultp;
}
-
-char *ada_la_decode (const char *encoded, int options)
+
+char *
+ada_la_decode (const char *encoded, int options)
{
return xstrdup (ada_decode (encoded));
}
{
if (type == NULL)
return NULL;
- CHECK_TYPEDEF (type);
- if (type != NULL &&
- (TYPE_CODE (type) == TYPE_CODE_PTR
- || TYPE_CODE (type) == TYPE_CODE_REF))
- return check_typedef (TYPE_TARGET_TYPE (type));
+ type = ada_check_typedef (type);
+ if (type != NULL
+ && (TYPE_CODE (type) == TYPE_CODE_PTR
+ || TYPE_CODE (type) == TYPE_CODE_REF))
+ return ada_check_typedef (TYPE_TARGET_TYPE (type));
else
return type;
}
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)),
value_copy (val));
else
return value_from_longest (desc_data_type (thin_descriptor_type (type)),
- VALUE_ADDRESS (val) + VALUE_OFFSET (val));
+ VALUE_ADDRESS (val) + value_offset (val));
}
/* True iff TYPE indicates a "thick" array pointer 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)
{
return NULL;
r = lookup_struct_elt_type (type, "BOUNDS", 1);
if (r != NULL)
- return check_typedef (r);
+ return ada_check_typedef (r);
}
else if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
{
r = lookup_struct_elt_type (type, "P_BOUNDS", 1);
if (r != NULL)
- return check_typedef (TYPE_TARGET_TYPE (check_typedef (r)));
+ return ada_check_typedef (TYPE_TARGET_TYPE (ada_check_typedef (r)));
}
return NULL;
}
static struct value *
desc_bounds (struct value *arr)
{
- struct type *type = check_typedef (VALUE_TYPE (arr));
+ struct type *type = ada_check_typedef (value_type (arr));
if (is_thin_pntr (type))
{
struct type *bounds_type =
LONGEST addr;
if (desc_bounds_type == NULL)
- error ("Bad GNAT array descriptor");
+ 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),
if (TYPE_CODE (type) == TYPE_CODE_PTR)
addr = value_as_long (arr);
else
- addr = VALUE_ADDRESS (arr) + VALUE_OFFSET (arr);
+ addr = VALUE_ADDRESS (arr) + value_offset (arr);
return
value_from_longest (lookup_pointer_type (bounds_type),
else if (is_thick_pntr (type))
return value_struct_elt (&arr, NULL, "P_BOUNDS", NULL,
- "Bad GNAT array descriptor");
+ _("Bad GNAT array descriptor"));
else
return NULL;
}
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)));
+ return 8 * TYPE_LENGTH (ada_check_typedef (TYPE_FIELD_TYPE (type, 1)));
}
/* If TYPE is the type of an array descriptor (fat or thin pointer) or a
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,
- "Bad GNAT array descriptor");
+ _("Bad GNAT array descriptor"));
else
return NULL;
}
desc_one_bound (struct value *bounds, int i, int which)
{
return value_struct_elt (&bounds, NULL, bound_name[2 * i + which - 2], NULL,
- "Bad GNAT array descriptor bounds");
+ _("Bad GNAT array descriptor bounds"));
}
/* If BOUNDS is an array-bounds structure type, return the bit position
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
+static int
desc_bound_bitsize (struct type *type, int i, int which)
{
type = desc_base_type (type);
an array descriptor type (representing an unconstrained array
type). */
-static int
-ada_is_direct_array_type (struct type *type)
+static int
+ada_is_direct_array_type (struct type *type)
{
if (type == NULL)
return 0;
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
return (TYPE_CODE (type) == TYPE_CODE_ARRAY
- || ada_is_array_descriptor_type (type));
+ || ada_is_array_descriptor_type (type));
+}
+
+/* Non-zero iff TYPE represents any kind of array in Ada, or a pointer
+ * to one. */
+
+int
+ada_is_array_type (struct type *type)
+{
+ while (type != NULL
+ && (TYPE_CODE (type) == TYPE_CODE_PTR
+ || TYPE_CODE (type) == TYPE_CODE_REF))
+ type = TYPE_TARGET_TYPE (type);
+ return ada_is_direct_array_type (type);
}
/* Non-zero iff TYPE is a simple array type or pointer to one. */
{
if (type == NULL)
return 0;
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
return (TYPE_CODE (type) == TYPE_CODE_ARRAY
|| (TYPE_CODE (type) == TYPE_CODE_PTR
&& TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY));
if (type == NULL)
return 0;
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
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)
+ || TYPE_CODE (data_type) == TYPE_CODE_ARRAY)
&& desc_arity (desc_bounds_type (type)) > 0;
}
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_packed_array_type (value_type (arr)))
+ return decode_packed_array_type (value_type (arr));
- if (!ada_is_array_descriptor_type (VALUE_TYPE (arr)))
- return VALUE_TYPE (arr);
+ if (!ada_is_array_descriptor_type (value_type (arr)))
+ return value_type (arr);
if (!bounds)
return
- check_typedef (TYPE_TARGET_TYPE (desc_data_type (VALUE_TYPE (arr))));
+ ada_check_typedef (TYPE_TARGET_TYPE (desc_data_type (value_type (arr))));
else
{
struct type *elt_type;
int arity;
struct value *descriptor;
- struct objfile *objf = TYPE_OBJFILE (VALUE_TYPE (arr));
+ 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));
+ elt_type = ada_array_element_type (value_type (arr), -1);
+ arity = ada_array_arity (value_type (arr));
if (elt_type == NULL || arity == 0)
- return check_typedef (VALUE_TYPE (arr));
+ return ada_check_typedef (value_type (arr));
descriptor = desc_bounds (arr);
if (value_as_long (descriptor) == 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));
+ create_range_type (range_type, value_type (low),
+ longest_to_int (value_as_long (low)),
+ longest_to_int (value_as_long (high)));
elt_type = create_array_type (array_type, elt_type, range_type);
}
struct value *
ada_coerce_to_simple_array_ptr (struct value *arr)
{
- if (ada_is_array_descriptor_type (VALUE_TYPE (arr)))
+ if (ada_is_array_descriptor_type (value_type (arr)))
{
struct type *arrType = ada_type_of_array (arr, 1);
if (arrType == NULL)
return NULL;
return value_cast (arrType, value_copy (desc_data (arr)));
}
- else if (ada_is_packed_array_type (VALUE_TYPE (arr)))
+ else if (ada_is_packed_array_type (value_type (arr)))
return decode_packed_array (arr);
else
return arr;
static struct value *
ada_coerce_to_simple_array (struct value *arr)
{
- if (ada_is_array_descriptor_type (VALUE_TYPE (arr)))
+ if (ada_is_array_descriptor_type (value_type (arr)))
{
struct value *arrVal = ada_coerce_to_simple_array_ptr (arr);
if (arrVal == NULL)
- error ("Bounds unavailable for null array pointer.");
+ error (_("Bounds unavailable for null array pointer."));
+ check_size (TYPE_TARGET_TYPE (value_type (arrVal)));
return value_ind (arrVal);
}
- else if (ada_is_packed_array_type (VALUE_TYPE (arr)))
+ else if (ada_is_packed_array_type (value_type (arr)))
return decode_packed_array (arr);
else
return arr;
struct value *mark = value_mark ();
struct value *dummy = value_from_longest (builtin_type_long, 0);
struct type *result;
- VALUE_TYPE (dummy) = type;
+ deprecated_set_value_type (dummy, type);
result = ada_type_of_array (dummy, 0);
value_free_to_mark (mark);
return result;
if (type == NULL)
return 0;
type = desc_base_type (type);
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
return
ada_type_name (type) != NULL
&& strstr (ada_type_name (type), "___XP") != NULL;
struct type *new_type;
LONGEST low_bound, high_bound;
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
return type;
new_type = alloc_type (TYPE_OBJFILE (type));
- new_elt_type = packed_array_type (check_typedef (TYPE_TARGET_TYPE (type)),
+ new_elt_type = packed_array_type (ada_check_typedef (TYPE_TARGET_TYPE (type)),
elt_bits);
create_array_type (new_type, new_elt_type, TYPE_FIELD_TYPE (type, 0));
TYPE_FIELD_BITSIZE (new_type, 0) = *elt_bits;
{
struct symbol *sym;
struct block **blocks;
- const char *raw_name = ada_type_name (check_typedef (type));
+ const char *raw_name = ada_type_name (ada_check_typedef (type));
char *name = (char *) alloca (strlen (raw_name) + 1);
char *tail = strstr (raw_name, "___XP");
struct type *shadow_type;
sym = standard_lookup (name, get_selected_block (0), VAR_DOMAIN);
if (sym == NULL || SYMBOL_TYPE (sym) == NULL)
{
- lim_warning ("could not find bounds information on packed array", 0);
+ lim_warning (_("could not find bounds information on packed array"));
return NULL;
}
shadow_type = SYMBOL_TYPE (sym);
if (TYPE_CODE (shadow_type) != TYPE_CODE_ARRAY)
{
- lim_warning ("could not understand bounds information on packed array",
- 0);
+ lim_warning (_("could not understand bounds information on packed array"));
return NULL;
}
if (sscanf (tail + sizeof ("___XP") - 1, "%ld", &bits) != 1)
{
lim_warning
- ("could not understand bit size information on packed array", 0);
+ (_("could not understand bit size information on packed array"));
return NULL;
}
struct type *type;
arr = ada_coerce_ref (arr);
- if (TYPE_CODE (VALUE_TYPE (arr)) == TYPE_CODE_PTR)
+ if (TYPE_CODE (value_type (arr)) == TYPE_CODE_PTR)
arr = ada_value_ind (arr);
- type = decode_packed_array_type (VALUE_TYPE (arr));
+ type = decode_packed_array_type (value_type (arr));
if (type == NULL)
{
- error ("can't unpack array");
+ error (_("can't unpack array"));
return NULL;
}
+
+ if (BITS_BIG_ENDIAN && ada_is_modular_type (value_type (arr)))
+ {
+ /* This is a (right-justified) modular type representing a packed
+ array with no wrapper. In order to interpret the value through
+ the (left-justified) packed array type we just built, we must
+ first left-justify it. */
+ int bit_size, bit_pos;
+ ULONGEST mod;
+
+ mod = ada_modulus (value_type (arr)) - 1;
+ bit_size = 0;
+ while (mod > 0)
+ {
+ bit_size += 1;
+ mod >>= 1;
+ }
+ bit_pos = HOST_CHAR_BIT * TYPE_LENGTH (value_type (arr)) - bit_size;
+ arr = ada_value_primitive_packed_val (arr, NULL,
+ bit_pos / HOST_CHAR_BIT,
+ bit_pos % HOST_CHAR_BIT,
+ bit_size,
+ type);
+ }
+
return coerce_unspec_val_to_type (arr, type);
}
bits = 0;
elt_total_bit_offset = 0;
- elt_type = check_typedef (VALUE_TYPE (arr));
+ elt_type = ada_check_typedef (value_type (arr));
for (i = 0; i < arity; i += 1)
{
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");
+ (_("attempt to do packed indexing of something other than a packed array"));
else
{
struct type *range_type = TYPE_INDEX_TYPE (elt_type);
if (get_discrete_bounds (range_type, &lowerbound, &upperbound) < 0)
{
- lim_warning ("don't know bounds of array", 0);
+ lim_warning (_("don't know bounds of array"));
lowerbound = upperbound = 0;
}
idx = value_as_long (value_pos_atr (ind[i]));
if (idx < lowerbound || idx > upperbound)
- lim_warning ("packed array index %ld out of bounds", (long) idx);
+ lim_warning (_("packed array index %ld out of bounds"), (long) idx);
bits = TYPE_FIELD_BITSIZE (elt_type, 0);
elt_total_bit_offset += (idx - lowerbound) * bits;
- elt_type = check_typedef (TYPE_TARGET_TYPE (elt_type));
+ elt_type = ada_check_typedef (TYPE_TARGET_TYPE (elt_type));
}
}
elt_off = elt_total_bit_offset / HOST_CHAR_BIT;
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;
- else
- VALUE_LVAL (v) = VALUE_LVAL (arr);
return v;
}
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,
+ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
+ long offset, int bit_offset, int bit_size,
struct type *type)
{
struct value *v;
the indices move. */
int delta = BITS_BIG_ENDIAN ? -1 : 1;
- CHECK_TYPEDEF (type);
+ type = ada_check_typedef (type);
if (obj == NULL)
{
v = allocate_value (type);
bytes = (unsigned char *) (valaddr + offset);
}
- else if (VALUE_LAZY (obj))
+ else if (value_lazy (obj))
{
v = value_at (type,
- VALUE_ADDRESS (obj) + VALUE_OFFSET (obj) + offset, NULL);
+ VALUE_ADDRESS (obj) + value_offset (obj) + offset);
bytes = (unsigned char *) alloca (len);
read_memory (VALUE_ADDRESS (v), bytes, len);
}
else
{
v = allocate_value (type);
- bytes = (unsigned char *) VALUE_CONTENTS (obj) + offset;
+ bytes = (unsigned char *) value_contents (obj) + offset;
}
if (obj != NULL)
VALUE_LVAL (v) = VALUE_LVAL (obj);
if (VALUE_LVAL (obj) == lval_internalvar)
VALUE_LVAL (v) = lval_internalvar_component;
- VALUE_ADDRESS (v) = VALUE_ADDRESS (obj) + VALUE_OFFSET (obj) + offset;
- VALUE_BITPOS (v) = bit_offset + VALUE_BITPOS (obj);
- VALUE_BITSIZE (v) = bit_size;
- if (VALUE_BITPOS (v) >= HOST_CHAR_BIT)
+ VALUE_ADDRESS (v) = VALUE_ADDRESS (obj) + value_offset (obj) + offset;
+ set_value_bitpos (v, bit_offset + value_bitpos (obj));
+ set_value_bitsize (v, bit_size);
+ if (value_bitpos (v) >= HOST_CHAR_BIT)
{
VALUE_ADDRESS (v) += 1;
- VALUE_BITPOS (v) -= HOST_CHAR_BIT;
+ set_value_bitpos (v, value_bitpos (v) - HOST_CHAR_BIT);
}
}
else
- VALUE_BITSIZE (v) = bit_size;
- unpacked = (unsigned char *) VALUE_CONTENTS (v);
+ set_value_bitsize (v, bit_size);
+ unpacked = (unsigned char *) value_contents (v);
srcBitsLeft = bit_size;
nsrc = len;
else if (BITS_BIG_ENDIAN)
{
src = len - 1;
- if (has_negatives (type) &&
- ((bytes[0] << bit_offset) & (1 << (HOST_CHAR_BIT - 1))))
+ if (has_negatives (type)
+ && ((bytes[0] << bit_offset) & (1 << (HOST_CHAR_BIT - 1))))
sign = ~0;
unusedLS =
(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;
+ targ = (bit_size + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT - 1;
break;
default:
accumSize = 0;
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 (gdb_byte *target, int targ_offset, const gdb_byte *source,
+ int src_offset, int n)
{
unsigned int accum, mask;
int accum_bits, chunk_size;
}
}
-
/* Store the contents of FROMVAL into the location of TOVAL.
Return a new value with the location of TOVAL and contents of
FROMVAL. Handles assignment into packed fields that have
static struct value *
ada_value_assign (struct value *toval, struct value *fromval)
{
- struct type *type = VALUE_TYPE (toval);
- int bits = VALUE_BITSIZE (toval);
+ struct type *type = value_type (toval);
+ int bits = value_bitsize (toval);
- if (!toval->modifiable)
- error ("Left operand of assignment is not a modifiable lvalue.");
+ toval = ada_coerce_ref (toval);
+ fromval = ada_coerce_ref (fromval);
- COERCE_REF (toval);
+ if (ada_is_direct_array_type (value_type (toval)))
+ toval = ada_coerce_to_simple_array (toval);
+ if (ada_is_direct_array_type (value_type (fromval)))
+ fromval = ada_coerce_to_simple_array (fromval);
+
+ if (!deprecated_value_modifiable (toval))
+ error (_("Left operand of assignment is not a modifiable lvalue."));
if (VALUE_LVAL (toval) == lval_memory
&& bits > 0
&& (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;
+ int len = (value_bitpos (toval)
+ + bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
char *buffer = (char *) alloca (len);
struct value *val;
+ CORE_ADDR to_addr = VALUE_ADDRESS (toval) + value_offset (toval);
if (TYPE_CODE (type) == TYPE_CODE_FLT)
fromval = value_cast (type, fromval);
- read_memory (VALUE_ADDRESS (toval) + VALUE_OFFSET (toval), buffer, len);
+ read_memory (to_addr, buffer, len);
if (BITS_BIG_ENDIAN)
- move_bits (buffer, VALUE_BITPOS (toval),
- VALUE_CONTENTS (fromval),
- TYPE_LENGTH (VALUE_TYPE (fromval)) * TARGET_CHAR_BIT -
+ 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 (to_addr, buffer, len);
+ if (deprecated_memory_changed_hook)
+ deprecated_memory_changed_hook (to_addr, len);
+
val = value_copy (toval);
- memcpy (VALUE_CONTENTS_RAW (val), VALUE_CONTENTS (fromval),
+ memcpy (value_contents_raw (val), value_contents (fromval),
TYPE_LENGTH (type));
- VALUE_TYPE (val) = type;
+ deprecated_set_value_type (val, type);
return val;
}
}
+/* Given that COMPONENT is a memory lvalue that is part of the lvalue
+ * CONTAINER, assign the contents of VAL to COMPONENTS's place in
+ * CONTAINER. Modifies the VALUE_CONTENTS of CONTAINER only, not
+ * COMPONENT, and not the inferior's memory. The current contents
+ * of COMPONENT are ignored. */
+static void
+value_assign_to_component (struct value *container, struct value *component,
+ struct value *val)
+{
+ LONGEST offset_in_container =
+ (LONGEST) (VALUE_ADDRESS (component) + value_offset (component)
+ - VALUE_ADDRESS (container) - value_offset (container));
+ int bit_offset_in_container =
+ value_bitpos (component) - value_bitpos (container);
+ int bits;
+
+ val = value_cast (value_type (component), val);
+
+ if (value_bitsize (component) == 0)
+ bits = TARGET_CHAR_BIT * TYPE_LENGTH (value_type (component));
+ else
+ bits = value_bitsize (component);
+
+ if (BITS_BIG_ENDIAN)
+ move_bits (value_contents_writeable (container) + offset_in_container,
+ value_bitpos (container) + bit_offset_in_container,
+ value_contents (val),
+ TYPE_LENGTH (value_type (component)) * TARGET_CHAR_BIT - bits,
+ bits);
+ else
+ move_bits (value_contents_writeable (container) + offset_in_container,
+ value_bitpos (container) + bit_offset_in_container,
+ value_contents (val), 0, bits);
+}
+
/* The value of the element of array ARR at the ARITY indices given in IND.
ARR may be either a simple array, GNAT array descriptor, or pointer
thereto. */
elt = ada_coerce_to_simple_array (arr);
- elt_type = check_typedef (VALUE_TYPE (elt));
+ elt_type = ada_check_typedef (value_type (elt));
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;
struct value *idx;
if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
- error ("too many subscripts (%d expected)", k);
+ 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);
return value_ind (arr);
}
+/* Given that ARRAY_PTR is a pointer or reference to an array of type TYPE (the
+ actual type of ARRAY_PTR is ignored), returns a reference to
+ the Ada slice of HIGH-LOW+1 elements starting at index LOW. The lower
+ bound of this array is LOW, as per Ada rules. */
+static struct value *
+ada_value_slice_ptr (struct value *array_ptr, struct type *type,
+ int low, int high)
+{
+ CORE_ADDR base = value_as_address (array_ptr)
+ + ((low - TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)))
+ * TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
+ struct type *index_type =
+ create_range_type (NULL, TYPE_TARGET_TYPE (TYPE_INDEX_TYPE (type)),
+ low, high);
+ struct type *slice_type =
+ create_array_type (NULL, TYPE_TARGET_TYPE (type), index_type);
+ return value_from_pointer (lookup_reference_type (slice_type), base);
+}
+
+
+static struct value *
+ada_value_slice (struct value *array, int low, int high)
+{
+ struct type *type = value_type (array);
+ struct type *index_type =
+ create_range_type (NULL, TYPE_INDEX_TYPE (type), low, high);
+ struct type *slice_type =
+ create_array_type (NULL, TYPE_TARGET_TYPE (type), index_type);
+ return value_cast (slice_type, value_slice (array, low, high - low + 1));
+}
+
/* If type is a record type in the form of a standard GNAT array
descriptor, returns the number of dimensions for type. If arr is a
simple array, returns the number of "array of"s that prefix its
while (TYPE_CODE (type) == TYPE_CODE_ARRAY)
{
arity += 1;
- type = check_typedef (TYPE_TARGET_TYPE (type));
+ type = ada_check_typedef (TYPE_TARGET_TYPE (type));
}
return arity;
p_array_type = TYPE_TARGET_TYPE (p_array_type);
while (k > 0 && p_array_type != NULL)
{
- p_array_type = check_typedef (TYPE_TARGET_TYPE (p_array_type));
+ p_array_type = ada_check_typedef (TYPE_TARGET_TYPE (p_array_type));
k -= 1;
}
return p_array_type;
result_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0));
/* FIXME: The stabs type r(0,0);bound;bound in an array type
has a target type of TYPE_CODE_UNDEF. We compensate here, but
- perhaps stabsread.c would make more sense. */
- if (result_type == NULL
- || TYPE_CODE (result_type) == TYPE_CODE_UNDEF)
- result_type = builtin_type_int;
+ perhaps stabsread.c would make more sense. */
+ if (result_type == NULL || TYPE_CODE (result_type) == TYPE_CODE_UNDEF)
+ result_type = builtin_type_int;
return result_type;
}
struct value *
ada_array_bound (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);
struct value *
ada_array_length (struct value *arr, int n)
{
- struct type *arr_type = check_typedef (VALUE_TYPE (arr));
+ struct type *arr_type = ada_check_typedef (value_type (arr));
if (ada_is_packed_array_type (arr_type))
return ada_array_length (decode_packed_array (arr), n);
}
else
return
- value_from_longest (builtin_type_ada_int,
+ value_from_longest (builtin_type_int,
value_as_long (desc_one_bound (desc_bounds (arr),
n, 1))
- value_as_long (desc_one_bound (desc_bounds (arr),
static struct value *
empty_array (struct type *arr_type, int low)
{
- return allocate_value (create_range_type (NULL, TYPE_INDEX_TYPE (arr_type),
- low, low - 1));
+ struct type *index_type =
+ create_range_type (NULL, TYPE_TARGET_TYPE (TYPE_INDEX_TYPE (arr_type)),
+ low, low - 1);
+ struct type *elt_type = ada_array_element_type (arr_type, 1);
+ return allocate_value (create_array_type (NULL, elt_type, index_type));
}
\f
if (ada_opname_table[i].op == op)
return ada_opname_table[i].decoded;
}
- error ("Could not find operator name for opcode");
+ error (_("Could not find operator name for opcode"));
}
static struct value *
resolve_subexp (struct expression **expp, int *pos, int deprocedure_p,
- struct type *context_type)
+ struct type *context_type)
{
int pc = *pos;
int i;
enum exp_opcode op = (*expp)->elts[pc].opcode;
struct value **argvec; /* Vector of operand types (alloca'ed). */
int nargs; /* Number of operands. */
+ int oplen;
argvec = NULL;
nargs = 0;
exp = *expp;
- /* Pass one: resolve operands, saving their types and updating *pos. */
+ /* Pass one: resolve operands, saving their types and updating *pos,
+ if needed. */
switch (op)
{
case OP_FUNCALL:
if (exp->elts[pc + 3].opcode == OP_VAR_VALUE
- && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
- *pos += 7;
+ && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
+ *pos += 7;
else
{
*pos += 3;
nargs = longest_to_int (exp->elts[pc + 1].longconst);
break;
- case UNOP_QUAL:
- *pos += 3;
- resolve_subexp (expp, pos, 1, exp->elts[pc + 1].type);
- break;
-
case UNOP_ADDR:
*pos += 1;
resolve_subexp (expp, pos, 0, NULL);
break;
- case OP_ATR_MODULUS:
- *pos += 4;
+ case UNOP_QUAL:
+ *pos += 3;
+ resolve_subexp (expp, pos, 1, exp->elts[pc + 1].type);
break;
+ case OP_ATR_MODULUS:
case OP_ATR_SIZE:
case OP_ATR_TAG:
- *pos += 1;
- nargs = 1;
- break;
-
case OP_ATR_FIRST:
case OP_ATR_LAST:
case OP_ATR_LENGTH:
case OP_ATR_POS:
case OP_ATR_VAL:
- *pos += 1;
- nargs = 2;
- break;
-
case OP_ATR_MIN:
case OP_ATR_MAX:
- *pos += 1;
- nargs = 3;
+ case TERNOP_IN_RANGE:
+ case BINOP_IN_BOUNDS:
+ case UNOP_IN_RANGE:
+ case OP_AGGREGATE:
+ case OP_OTHERS:
+ case OP_CHOICES:
+ case OP_POSITIONAL:
+ case OP_DISCRETE_RANGE:
+ case OP_NAME:
+ ada_forward_operator_length (exp, pc, &oplen, &nargs);
+ *pos += oplen;
break;
case BINOP_ASSIGN:
if (arg1 == NULL)
resolve_subexp (expp, pos, 1, NULL);
else
- resolve_subexp (expp, pos, 1, VALUE_TYPE (arg1));
+ resolve_subexp (expp, pos, 1, value_type (arg1));
break;
}
case UNOP_CAST:
- case UNOP_IN_RANGE:
*pos += 3;
nargs = 1;
break;
case BINOP_REPEAT:
case BINOP_SUBSCRIPT:
case BINOP_COMMA:
- *pos += 1;
- nargs = 2;
- break;
case UNOP_NEG:
case UNOP_PLUS:
nargs = 1;
break;
- case OP_STRING:
- (*pos) += 3
- + BYTES_TO_EXP_ELEM (longest_to_int (exp->elts[pc + 1].longconst) + 1);
- break;
-
case TERNOP_SLICE:
- case TERNOP_IN_RANGE:
*pos += 1;
nargs = 3;
break;
- case BINOP_IN_BOUNDS:
- *pos += 3;
- nargs = 2;
+ case OP_STRING:
break;
default:
- error ("Unexpected operator during name resolution");
+ error (_("Unexpected operator during name resolution"));
}
- 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] = resolve_subexp (expp, pos, 1, NULL);
argvec[i] = NULL;
case OP_VAR_VALUE:
if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN)
- {
- struct ada_symbol_info *candidates;
- int n_candidates;
+ {
+ struct ada_symbol_info *candidates;
+ int n_candidates;
- n_candidates =
- ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME (exp->elts[pc + 2]
- .symbol),
- exp->elts[pc + 1].block,
- VAR_DOMAIN, &candidates);
+ n_candidates =
+ ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME
+ (exp->elts[pc + 2].symbol),
+ exp->elts[pc + 1].block, VAR_DOMAIN,
+ &candidates);
- 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 (candidates[j].sym))
- {
- 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:
- case LOC_COMPUTED:
- case LOC_COMPUTED_ARG:
- goto FoundNonType;
- default:
- break;
- }
- FoundNonType:
- if (j < n_candidates)
- {
- j = 0;
- while (j < n_candidates)
- {
- if (SYMBOL_CLASS (candidates[j].sym) == LOC_TYPEDEF)
- {
- candidates[j] = candidates[n_candidates - 1];
- n_candidates -= 1;
- }
- else
- j += 1;
- }
- }
- }
+ 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 (candidates[j].sym))
+ {
+ 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:
+ case LOC_COMPUTED:
+ case LOC_COMPUTED_ARG:
+ goto FoundNonType;
+ default:
+ break;
+ }
+ FoundNonType:
+ if (j < n_candidates)
+ {
+ j = 0;
+ while (j < n_candidates)
+ {
+ if (SYMBOL_CLASS (candidates[j].sym) == LOC_TYPEDEF)
+ {
+ candidates[j] = candidates[n_candidates - 1];
+ n_candidates -= 1;
+ }
+ else
+ j += 1;
+ }
+ }
+ }
- if (n_candidates == 0)
- error ("No definition found for %s",
- SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
- else if (n_candidates == 1)
- i = 0;
- else if (deprocedure_p
- && !is_nonfunction (candidates, n_candidates))
- {
- i = ada_resolve_function (candidates, n_candidates, NULL, 0,
- SYMBOL_LINKAGE_NAME (exp->elts[pc + 2]
- .symbol),
- context_type);
- if (i < 0)
- error ("Could not find a match for %s",
- SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
- }
- else
- {
- printf_filtered ("Multiple matches for %s\n",
- SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
- user_select_syms (candidates, n_candidates, 1);
- i = 0;
- }
+ if (n_candidates == 0)
+ error (_("No definition found for %s"),
+ SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
+ else if (n_candidates == 1)
+ i = 0;
+ else if (deprocedure_p
+ && !is_nonfunction (candidates, n_candidates))
+ {
+ i = ada_resolve_function
+ (candidates, n_candidates, NULL, 0,
+ SYMBOL_LINKAGE_NAME (exp->elts[pc + 2].symbol),
+ context_type);
+ if (i < 0)
+ error (_("Could not find a match for %s"),
+ SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
+ }
+ else
+ {
+ printf_filtered (_("Multiple matches for %s\n"),
+ SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
+ user_select_syms (candidates, n_candidates, 1);
+ i = 0;
+ }
- exp->elts[pc + 1].block = candidates[i].block;
- exp->elts[pc + 2].symbol = candidates[i].sym;
- if (innermost_block == NULL ||
- contained_in (candidates[i].block, innermost_block))
- innermost_block = candidates[i].block;
- }
+ exp->elts[pc + 1].block = candidates[i].block;
+ exp->elts[pc + 2].symbol = candidates[i].sym;
+ if (innermost_block == NULL
+ || contained_in (candidates[i].block, innermost_block))
+ innermost_block = candidates[i].block;
+ }
- 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);
- exp = *expp;
- }
+ 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);
+ exp = *expp;
+ }
break;
case OP_FUNCALL:
{
if (exp->elts[pc + 3].opcode == OP_VAR_VALUE
- && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
+ && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
{
struct ada_symbol_info *candidates;
int n_candidates;
n_candidates =
- ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME (exp->elts[pc + 5]
- .symbol),
- exp->elts[pc + 4].block,
- VAR_DOMAIN, &candidates);
+ ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME
+ (exp->elts[pc + 5].symbol),
+ exp->elts[pc + 4].block, VAR_DOMAIN,
+ &candidates);
if (n_candidates == 1)
i = 0;
else
{
- i = ada_resolve_function (candidates, n_candidates,
- argvec, nargs,
- SYMBOL_LINKAGE_NAME (exp->elts[pc+5]
- .symbol),
- context_type);
+ i = ada_resolve_function
+ (candidates, n_candidates,
+ argvec, nargs,
+ SYMBOL_LINKAGE_NAME (exp->elts[pc + 5].symbol),
+ context_type);
if (i < 0)
- error ("Could not find a match for %s",
+ error (_("Could not find a match for %s"),
SYMBOL_PRINT_NAME (exp->elts[pc + 5].symbol));
}
exp->elts[pc + 4].block = candidates[i].block;
exp->elts[pc + 5].symbol = candidates[i].sym;
- if (innermost_block == NULL ||
- contained_in (candidates[i].block, innermost_block))
+ if (innermost_block == NULL
+ || contained_in (candidates[i].block, innermost_block))
innermost_block = candidates[i].block;
}
}
(struct block *) NULL, VAR_DOMAIN,
&candidates);
i = ada_resolve_function (candidates, n_candidates, argvec, nargs,
- ada_decoded_op_name (op), NULL);
+ ada_decoded_op_name (op), NULL);
if (i < 0)
break;
- replace_operator_with_call (expp, pc, nargs, 1,
- candidates[i].sym, candidates[i].block);
+ replace_operator_with_call (expp, pc, nargs, 1,
+ candidates[i].sym, candidates[i].block);
exp = *expp;
}
break;
static int
ada_type_match (struct type *ftype, struct type *atype, int may_deref)
{
- CHECK_TYPEDEF (ftype);
- CHECK_TYPEDEF (atype);
+ ftype = ada_check_typedef (ftype);
+ atype = ada_check_typedef (atype);
if (TYPE_CODE (ftype) == TYPE_CODE_REF)
ftype = TYPE_TARGET_TYPE (ftype);
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));
+ return (may_deref
+ && ada_type_match (TYPE_TARGET_TYPE (ftype), atype, 0));
case TYPE_CODE_INT:
case TYPE_CODE_ENUM:
case TYPE_CODE_RANGE:
int i;
struct type *func_type = SYMBOL_TYPE (func);
- if (SYMBOL_CLASS (func) == LOC_CONST &&
- TYPE_CODE (func_type) == TYPE_CODE_ENUM)
+ 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)
return 0;
for (i = 0; i < n_actuals; i += 1)
{
if (actuals[i] == NULL)
- return 0;
- else
- {
- struct type *ftype = check_typedef (TYPE_FIELD_TYPE (func_type, i));
- struct type *atype = check_typedef (VALUE_TYPE (actuals[i]));
+ return 0;
+ else
+ {
+ struct type *ftype = ada_check_typedef (TYPE_FIELD_TYPE (func_type, i));
+ struct type *atype = ada_check_typedef (value_type (actuals[i]));
- if (!ada_type_match (ftype, atype, 1))
- return 0;
- }
+ if (!ada_type_match (ftype, atype, 1))
+ return 0;
+ }
}
return 1;
}
{
for (k = 0; k < nsyms; k += 1)
{
- struct type *type = check_typedef (SYMBOL_TYPE (syms[k].sym));
+ struct type *type = ada_check_typedef (SYMBOL_TYPE (syms[k].sym));
if (ada_args_match (syms[k].sym, args, nargs)
&& return_match (type, return_type))
return -1;
else if (m > 1)
{
- printf_filtered ("Multiple matches for %s\n", name);
+ printf_filtered (_("Multiple matches for %s\n"), name);
user_select_syms (syms, m, 1);
return 0;
}
int first_choice = (max_results == 1) ? 1 : 2;
if (max_results < 1)
- error ("Request to select 0 symbols!");
+ error (_("Request to select 0 symbols!"));
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, nsyms);
if (SYMBOL_CLASS (syms[i].sym) == LOC_BLOCK)
{
- struct symtab_and_line sal = find_function_start_sal (syms[i].sym, 1);
- printf_unfiltered ("[%d] %s at %s:%d\n",
- i + first_choice,
- SYMBOL_PRINT_NAME (syms[i].sym),
- sal.symtab == NULL
- ? "<no source file available>"
- : sal.symtab->filename, sal.line);
+ struct symtab_and_line sal =
+ find_function_start_sal (syms[i].sym, 1);
+ if (sal.symtab == NULL)
+ printf_unfiltered (_("[%d] %s at <no source file available>:%d\n"),
+ i + first_choice,
+ SYMBOL_PRINT_NAME (syms[i].sym),
+ sal.line);
+ else
+ printf_unfiltered (_("[%d] %s at %s:%d\n"), i + first_choice,
+ SYMBOL_PRINT_NAME (syms[i].sym),
+ sal.symtab->filename, sal.line);
continue;
}
else
struct symtab *symtab = symtab_for_sym (syms[i].sym);
if (SYMBOL_LINE (syms[i].sym) != 0 && symtab != NULL)
- printf_unfiltered ("[%d] %s at %s:%d\n",
+ printf_unfiltered (_("[%d] %s at %s:%d\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
symtab->filename, SYMBOL_LINE (syms[i].sym));
- else if (is_enumeral && TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
+ else if (is_enumeral
+ && TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
{
- printf_unfiltered ("[%d] ", i + first_choice);
- ada_print_type (SYMBOL_TYPE (syms[i].sym), NULL,
- gdb_stdout, -1, 0);
- printf_unfiltered ("'(%s) (enumeral)\n",
+ printf_unfiltered (("[%d] "), i + first_choice);
+ ada_print_type (SYMBOL_TYPE (syms[i].sym), NULL,
+ gdb_stdout, -1, 0);
+ printf_unfiltered (_("'(%s) (enumeral)\n"),
SYMBOL_PRINT_NAME (syms[i].sym));
}
else if (symtab != NULL)
printf_unfiltered (is_enumeral
- ? "[%d] %s in %s (enumeral)\n"
- : "[%d] %s at %s:?\n",
+ ? _("[%d] %s in %s (enumeral)\n")
+ : _("[%d] %s at %s:?\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
symtab->filename);
else
printf_unfiltered (is_enumeral
- ? "[%d] %s (enumeral)\n"
- : "[%d] %s at ?\n",
+ ? _("[%d] %s (enumeral)\n")
+ : _("[%d] %s at ?\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym));
}
if (prompt == NULL)
prompt = ">";
- printf_unfiltered ("%s ", prompt);
+ printf_unfiltered (("%s "), prompt);
gdb_flush (gdb_stdout);
args = command_line_input ((char *) NULL, 0, annotation_suffix);
if (args == NULL)
- error_no_arg ("one or more choice numbers");
+ error_no_arg (_("one or more choice numbers"));
n_chosen = 0;
-
+
/* Set choices[0 .. n_chosen-1] to the users' choices in ascending
order, as given in args. Choices are validated. */
while (1)
while (isspace (*args))
args += 1;
if (*args == '\0' && n_chosen == 0)
- error_no_arg ("one or more choice numbers");
+ error_no_arg (_("one or more choice numbers"));
else if (*args == '\0')
break;
choice = strtol (args, &args2, 10);
if (args == args2 || choice < 0
|| choice > n_choices + first_choice - 1)
- error ("Argument must be choice number");
+ error (_("Argument must be choice number"));
args = args2;
if (choice == 0)
- error ("cancelled");
+ error (_("cancelled"));
if (choice < first_choice)
{
}
if (n_chosen > max_results)
- error ("Select no more than %d of the above", max_results);
+ error (_("Select no more than %d of the above"), max_results);
return n_chosen;
}
static int
possible_user_operator_p (enum exp_opcode op, struct value *args[])
{
- struct type *type0 =
- (args[0] == NULL) ? NULL : check_typedef (VALUE_TYPE (args[0]));
+ struct type *type0 =
+ (args[0] == NULL) ? NULL : ada_check_typedef (value_type (args[0]));
struct type *type1 =
- (args[1] == NULL) ? NULL : check_typedef (VALUE_TYPE (args[1]));
+ (args[1] == NULL) ? NULL : ada_check_typedef (value_type (args[1]));
if (type0 == NULL)
return 0;
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)));
type = SYMBOL_TYPE (sym);
if (type == NULL || TYPE_NFIELDS (type) < 1)
- error ("Improperly encoded renaming.");
+ error (_("Improperly encoded renaming."));
raw_name = TYPE_FIELD_NAME (type, 0);
len = (raw_name == NULL ? 0 : strlen (raw_name)) - 5;
if (len <= 0)
- error ("Improperly encoded renaming.");
+ error (_("Improperly encoded renaming."));
result = xmalloc (len + 1);
strncpy (result, raw_name, len);
result[len] = '\000';
return result;
}
+
\f
/* Evaluation: Function Calls */
static struct value *
ensure_lval (struct value *val, CORE_ADDR *sp)
{
- CORE_ADDR old_sp = *sp;
-
- if (VALUE_LVAL (val))
- return val;
+ if (! VALUE_LVAL (val))
+ {
+ int len = TYPE_LENGTH (ada_check_typedef (value_type (val)));
- if (DEPRECATED_STACK_ALIGN_P ())
- *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val),
- DEPRECATED_STACK_ALIGN
- (TYPE_LENGTH (check_typedef (VALUE_TYPE (val)))));
- else
- *sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val),
- TYPE_LENGTH (check_typedef (VALUE_TYPE (val))));
+ /* The following is taken from the structure-return code in
+ call_function_by_hand. FIXME: Therefore, some refactoring seems
+ indicated. */
+ if (gdbarch_inner_than (current_gdbarch, 1, 2))
+ {
+ /* Stack grows downward. Align SP and VALUE_ADDRESS (val) after
+ reserving sufficient space. */
+ *sp -= len;
+ if (gdbarch_frame_align_p (current_gdbarch))
+ *sp = gdbarch_frame_align (current_gdbarch, *sp);
+ VALUE_ADDRESS (val) = *sp;
+ }
+ else
+ {
+ /* Stack grows upward. Align the frame, allocate space, and
+ then again, re-align the frame. */
+ if (gdbarch_frame_align_p (current_gdbarch))
+ *sp = gdbarch_frame_align (current_gdbarch, *sp);
+ VALUE_ADDRESS (val) = *sp;
+ *sp += len;
+ if (gdbarch_frame_align_p (current_gdbarch))
+ *sp = gdbarch_frame_align (current_gdbarch, *sp);
+ }
- VALUE_LVAL (val) = lval_memory;
- if (INNER_THAN (1, 2))
- VALUE_ADDRESS (val) = *sp;
- else
- VALUE_ADDRESS (val) = old_sp;
+ write_memory (VALUE_ADDRESS (val), value_contents_raw (val), len);
+ }
return val;
}
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 *actual_type = ada_check_typedef (value_type (actual));
+ struct type *formal_type = ada_check_typedef (formal_type0);
struct type *formal_target =
TYPE_CODE (formal_type) == TYPE_CODE_PTR
- ? check_typedef (TYPE_TARGET_TYPE (formal_type)) : formal_type;
+ ? ada_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;
+ ? ada_check_typedef (TYPE_TARGET_TYPE (actual_type)) : actual_type;
if (ada_is_array_descriptor_type (formal_target)
&& TYPE_CODE (actual_target) == TYPE_CODE_ARRAY)
if (VALUE_LVAL (actual) != lval_memory)
{
struct value *val;
- actual_type = check_typedef (VALUE_TYPE (actual));
+ actual_type = ada_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 = ensure_lval (val, sp);
}
struct value *bounds = allocate_value (bounds_type);
int i;
- for (i = ada_array_arity (check_typedef (VALUE_TYPE (arr))); i > 0; i -= 1)
+ for (i = ada_array_arity (ada_check_typedef (value_type (arr))); i > 0; i -= 1)
{
- modify_general_field (VALUE_CONTENTS (bounds),
+ modify_general_field (value_contents_writeable (bounds),
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),
+ modify_general_field (value_contents_writeable (bounds),
value_as_long (ada_array_bound (arr, i, 1)),
desc_bound_bitpos (bounds_type, i, 1),
desc_bound_bitsize (bounds_type, i, 1));
bounds = ensure_lval (bounds, sp);
- modify_general_field (VALUE_CONTENTS (descriptor),
- VALUE_ADDRESS (ensure_lval (arr, sp)),
- fat_pntr_data_bitpos (desc_type),
- fat_pntr_data_bitsize (desc_type));
+ modify_general_field (value_contents_writeable (descriptor),
+ VALUE_ADDRESS (ensure_lval (arr, sp)),
+ fat_pntr_data_bitpos (desc_type),
+ fat_pntr_data_bitsize (desc_type));
- modify_general_field (VALUE_CONTENTS (descriptor),
+ modify_general_field (value_contents_writeable (descriptor),
VALUE_ADDRESS (bounds),
fat_pntr_bounds_bitpos (desc_type),
fat_pntr_bounds_bitsize (desc_type));
{
int i;
- if (TYPE_NFIELDS (VALUE_TYPE (func)) == 0
- || nargs != TYPE_NFIELDS (VALUE_TYPE (func)))
+ 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);
+ convert_actual (args[i], TYPE_FIELD_TYPE (value_type (func), i), sp);
}
\f
- /* Experimental Symbol Cache Module */
-
-/* This module may well have been OBE, due to improvements in the
- symbol-table module. So until proven otherwise, it is disabled in
- the submitted public code, and may be removed from all sources
- in the future. */
-
-#ifdef GNAT_GDB
-
-/* This section implements a simple, fixed-sized hash table for those
- Ada-mode symbols that get looked up in the course of executing the user's
- commands. The size is fixed on the grounds that there are not
- likely to be all that many symbols looked up during any given
- session, regardless of the size of the symbol table. If we decide
- to go to a resizable table, let's just use the stuff from libiberty
- instead. */
-
-#define HASH_SIZE 1009
-
-struct cache_entry {
- const char *name;
- domain_enum namespace;
- struct symbol *sym;
- struct symtab *symtab;
- struct block *block;
- struct cache_entry *next;
-};
-
-static struct obstack cache_space;
-
-static struct cache_entry *cache[HASH_SIZE];
-
-/* Clear all entries from the symbol cache. */
-
-void
-clear_ada_sym_cache (void)
-{
- obstack_free (&cache_space, NULL);
- obstack_init (&cache_space);
- memset (cache, '\000', sizeof (cache));
-}
-
-static struct cache_entry **
-find_entry (const char *name, domain_enum namespace)
-{
- int h = msymbol_hash (name) % HASH_SIZE;
- struct cache_entry **e;
- for (e = &cache[h]; *e != NULL; e = &(*e)->next)
- {
- if (namespace == (*e)->namespace && strcmp (name, (*e)->name) == 0)
- return e;
- }
- return NULL;
-}
+/* Dummy definitions for an experimental caching module that is not
+ * used in the public sources. */
-/* Return (in SYM) the last cached definition for global or static symbol NAME
- in namespace DOMAIN. Returns 1 if entry found, 0 otherwise.
- If SYMTAB is non-NULL, store the symbol
- table in which the symbol was found there, or NULL if not found.
- *BLOCK is set to the block in which NAME is found. */
-
-static int
-lookup_cached_symbol (const char *name, domain_enum namespace,
- struct symbol **sym, struct block **block,
- struct symtab **symtab)
-{
- struct cache_entry **e = find_entry (name, namespace);
- if (e == NULL)
- return 0;
- if (sym != NULL)
- *sym = (*e)->sym;
- if (block != NULL)
- *block = (*e)->block;
- if (symtab != NULL)
- *symtab = (*e)->symtab;
- return 1;
-}
-
-/* Set the cached definition of NAME in DOMAIN to SYM in block
- BLOCK and symbol table SYMTAB. */
-
-static void
-cache_symbol (const char *name, domain_enum namespace, struct symbol *sym,
- struct block *block, struct symtab *symtab)
-{
- int h = msymbol_hash (name) % HASH_SIZE;
- char *copy;
- struct cache_entry *e =
- (struct cache_entry *) obstack_alloc(&cache_space, sizeof (*e));
- e->next = cache[h];
- cache[h] = e;
- e->name = copy = obstack_alloc (&cache_space, strlen (name) + 1);
- strcpy (copy, name);
- e->sym = sym;
- e->namespace = namespace;
- e->symtab = symtab;
- e->block = block;
-}
-
-#else
static int
lookup_cached_symbol (const char *name, domain_enum namespace,
- struct symbol **sym, struct block **block,
- struct symtab **symtab)
+ struct symbol **sym, struct block **block,
+ struct symtab **symtab)
{
return 0;
}
static void
cache_symbol (const char *name, domain_enum namespace, struct symbol *sym,
- struct block *block, struct symtab *symtab)
+ struct block *block, struct symtab *symtab)
{
}
-#endif /* GNAT_GDB */
\f
/* Symbol Lookup */
if (lookup_cached_symbol (name, domain, &sym, NULL, NULL))
return sym;
- sym = lookup_symbol_in_language (name, block, domain, language_c, 0, &symtab);
+ sym =
+ lookup_symbol_in_language (name, block, domain, language_c, 0, &symtab);
cache_symbol (name, domain, sym, block_found, symtab);
return sym;
}
records in OBSTACKP. Do nothing if SYM is a duplicate. */
static void
-add_defn_to_vec (struct obstack *obstackp,
- struct symbol *sym,
- struct block *block,
- struct symtab *symtab)
+add_defn_to_vec (struct obstack *obstackp,
+ struct symbol *sym,
+ struct block *block, struct symtab *symtab)
{
int i;
size_t tmp;
struct ada_symbol_info *prevDefns = defns_collected (obstackp, 0);
- if (SYMBOL_TYPE (sym) != NULL)
- CHECK_TYPEDEF (SYMBOL_TYPE (sym));
+ /* Do not try to complete stub types, as the debugger is probably
+ already scanning all symbols matching a certain name at the
+ time when this function is called. Trying to replace the stub
+ type by its associated full type will cause us to restart a scan
+ which may lead to an infinite recursion. Instead, the client
+ collecting the matching symbols will end up collecting several
+ matches, with at least one of them complete. It can then filter
+ out the stub ones if needed. */
+
for (i = num_defns_collected (obstackp) - 1; i >= 0; i -= 1)
{
if (lesseq_defined_than (sym, prevDefns[i].sym))
{
prevDefns[i].sym = sym;
prevDefns[i].block = block;
- prevDefns[i].symtab = symtab;
+ prevDefns[i].symtab = symtab;
return;
- }
+ }
}
{
/* Number of ada_symbol_info structures currently collected in
current vector in *OBSTACKP. */
-static int
-num_defns_collected (struct obstack *obstackp)
+static int
+num_defns_collected (struct obstack *obstackp)
{
return obstack_object_size (obstackp) / sizeof (struct ada_symbol_info);
}
vector in *OBSTACKP. If FINISH, close off the vector and return
its final address. */
-static struct ada_symbol_info *
+static struct ada_symbol_info *
defns_collected (struct obstack *obstackp, int finish)
{
if (finish)
{
struct partial_symbol *psym = start[i];
- if (SYMBOL_DOMAIN (psym) == namespace &&
- wild_match (name, name_len, SYMBOL_LINKAGE_NAME (psym)))
+ if (SYMBOL_DOMAIN (psym) == namespace
+ && wild_match (name, name_len, SYMBOL_LINKAGE_NAME (psym)))
return psym;
}
return NULL;
}
else if (cmp == 0
&& is_name_suffix (SYMBOL_LINKAGE_NAME (psym)
- + name_len))
+ + name_len))
return psym;
}
i += 1;
cmp = strncmp ("_ada_", SYMBOL_LINKAGE_NAME (psym), 5);
if (cmp == 0)
cmp = strncmp (name, SYMBOL_LINKAGE_NAME (psym) + 5,
- name_len);
+ name_len);
}
if (cmp < 0)
}
else if (cmp == 0
&& is_name_suffix (SYMBOL_LINKAGE_NAME (psym)
- + name_len + 5))
+ + name_len + 5))
return psym;
}
i += 1;
struct dict_iterator iter;
int j;
- ALL_SYMTABS (objfile, s)
+ ALL_PRIMARY_SYMTABS (objfile, s)
{
switch (SYMBOL_CLASS (sym))
{
case LOC_LABEL:
case LOC_BLOCK:
case LOC_CONST_BYTES:
- b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
- ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
- return s;
- b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
- ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
- return s;
+ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
+ ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
+ return s;
+ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
+ ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
+ return s;
break;
default:
break;
case LOC_BASEREG_ARG:
case LOC_COMPUTED:
case LOC_COMPUTED_ARG:
- for (j = FIRST_LOCAL_BLOCK;
- j < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s)); j += 1)
- {
- b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), j);
- ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
- return s;
- }
- break;
+ for (j = FIRST_LOCAL_BLOCK;
+ j < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s)); j += 1)
+ {
+ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), j);
+ ALL_BLOCK_SYMBOLS (b, iter, tmp_sym) if (sym == tmp_sym)
+ return s;
+ }
+ break;
default:
break;
}
return NULL;
}
-/* Return up minimal symbol for NAME, folded and encoded according to
- Ada conventions, or NULL if none. The last two arguments are ignored. */
-
-static struct minimal_symbol *
-ada_lookup_minimal_symbol (const char *name, const char *sfile,
- struct objfile *objf)
-{
- return ada_lookup_simple_minsym (ada_encode (name));
-}
-
/* For all subprograms that statically enclose the subprogram of the
selected frame, add symbols matching identifier NAME in DOMAIN
and their blocks to the list of data in OBSTACKP, as for
static void
add_symbols_from_enclosing_procs (struct obstack *obstackp,
- const char *name, domain_enum namespace,
+ const char *name, domain_enum namespace,
int wild_match)
{
-#ifdef HAVE_ADD_SYMBOLS_FROM_ENCLOSING_PROCS
- /* Use a heuristic to find the frames of enclosing subprograms: treat the
- pointer-sized value at location 0 from the local-variable base of a
- frame as a static link, and then search up the call stack for a
- frame with that same local-variable base. */
- static struct symbol static_link_sym;
- static struct symbol *static_link;
- struct value *target_link_val;
-
- struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
- struct frame_info *frame;
-
- if (! target_has_stack)
- return;
-
- if (static_link == NULL)
- {
- /* Initialize the local variable symbol that stands for the
- static link (when there is one). */
- static_link = &static_link_sym;
- SYMBOL_LINKAGE_NAME (static_link) = "";
- SYMBOL_LANGUAGE (static_link) = language_unknown;
- SYMBOL_CLASS (static_link) = LOC_LOCAL;
- SYMBOL_DOMAIN (static_link) = VAR_DOMAIN;
- SYMBOL_TYPE (static_link) = lookup_pointer_type (builtin_type_void);
- SYMBOL_VALUE (static_link) =
- -(long) TYPE_LENGTH (SYMBOL_TYPE (static_link));
- }
-
- frame = get_selected_frame ();
- if (frame == NULL
- || inside_main_func (get_frame_address_in_block (frame)))
- return;
-
- target_link_val = read_var_value (static_link, frame);
- while (target_link_val != NULL
- && num_defns_collected (obstackp) == 0
- && frame_relative_level (frame) <= MAX_ENCLOSING_FRAME_LEVELS)
- {
- CORE_ADDR target_link = value_as_address (target_link_val);
-
- frame = get_prev_frame (frame);
- if (frame == NULL)
- break;
-
- if (get_frame_locals_address (frame) == target_link)
- {
- struct block *block;
-
- QUIT;
-
- block = get_frame_block (frame, 0);
- while (block != NULL && block_function (block) != NULL
- && num_defns_collected (obstackp) == 0)
- {
- QUIT;
-
- ada_add_block_symbols (obstackp, block, name, namespace,
- NULL, NULL, wild_match);
-
- block = BLOCK_SUPERBLOCK (block);
- }
- }
- }
-
- do_cleanups (old_chain);
-#endif
-}
-
-/* FIXME: The next two routines belong in symtab.c */
-
-static void restore_language (void* lang)
-{
- set_language ((enum language) lang);
-}
-
-/* As for lookup_symbol, but performed as if the current language
- were LANG. */
-
-struct symbol *
-lookup_symbol_in_language (const char *name, const struct block *block,
- domain_enum domain, enum language lang,
- int *is_a_field_of_this, struct symtab **symtab)
-{
- struct cleanup *old_chain
- = make_cleanup (restore_language, (void*) current_language->la_language);
- struct symbol *result;
- set_language (lang);
- result = lookup_symbol (name, block, domain, is_a_field_of_this, symtab);
- do_cleanups (old_chain);
- return result;
}
/* True if TYPE is definitely an artificial type supplied to a symbol
if (i != j
&& SYMBOL_LINKAGE_NAME (syms[j].sym) != NULL
&& strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym),
- SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0
+ SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0
&& SYMBOL_CLASS (syms[i].sym) == SYMBOL_CLASS (syms[j].sym)
&& SYMBOL_VALUE_ADDRESS (syms[i].sym)
== SYMBOL_VALUE_ADDRESS (syms[j].sym))
{
int k;
for (k = i + 1; k < nsyms; k += 1)
- syms[k - 1] = syms[k];
+ syms[k - 1] = syms[k];
nsyms -= 1;
goto NextSymbol;
}
<scope>__<rename>___<XR extension>.
So, to extract the scope, we search for the "___XR" extension,
and then backtrack until we find the first "__". */
-
+
const char *name = type_name_no_tag (renaming_type);
char *suffix = strstr (name, "___XR");
char *last;
for (last = suffix - 3; last > name; last--)
if (last[0] == '_' && last[1] == '_')
break;
-
+
/* Make a copy of scope and return it. */
scope_len = last - name;
small complication with library-level functions (see below). */
char *fun_name;
-
+
/* If it is a function that has not been defined at library level,
then we should be able to look it up in the symbols. */
if (standard_lookup (name, NULL, VAR_DOMAIN) != NULL)
"_ada_" followed by NAME can be found. */
/* Do a quick check that NAME does not contain "__", since library-level
- functions names can not contain "__" in them. */
+ functions names cannot contain "__" in them. */
if (strstr (name, "__") != NULL)
return 0;
- fun_name = (char *) alloca (strlen (name) + 5 + 1);
- xasprintf (&fun_name, "_ada_%s", name);
+ fun_name = xstrprintf ("_ada_%s", name);
return (standard_lookup (fun_name, NULL, VAR_DOMAIN) == NULL);
}
/* Check that the rename is in the current function scope by checking
that its name starts with SCOPE. */
-
+
/* If the function name starts with "_ada_", it means that it is
a library-level function. Strip this prefix before doing the
comparison, as the encoding for the renaming does not contain
static int
remove_out_of_scope_renamings (struct ada_symbol_info *syms,
- int nsyms,
- struct block *current_block)
+ int nsyms, const struct block *current_block)
{
struct symbol *current_function;
char *current_function_name;
/* Extract the function name associated to CURRENT_BLOCK.
Abort if unable to do so. */
-
+
if (current_block == NULL)
return nsyms;
-
+
current_function = block_function (current_block);
if (current_function == NULL)
return nsyms;
{
int j;
for (j = i + 1; j < nsyms; j++)
- syms[j - 1] = syms[j];
+ syms[j - 1] = syms[j];
nsyms -= 1;
}
else
int
ada_lookup_symbol_list (const char *name0, const struct block *block0,
- domain_enum namespace,
- struct ada_symbol_info **results)
+ domain_enum namespace,
+ struct ada_symbol_info **results)
{
struct symbol *sym;
struct symtab *s;
wild_match = (strstr (name0, "__") == NULL);
name = name0;
- block = (struct block *) block0; /* FIXME: No cast ought to be
- needed, but adding const will
- have a cascade effect. */
+ block = (struct block *) block0; /* FIXME: No cast ought to be
+ needed, but adding const will
+ have a cascade effect. */
if (strncmp (name0, "standard__", sizeof ("standard__") - 1) == 0)
{
wild_match = 0;
while (block != NULL)
{
block_depth += 1;
- ada_add_block_symbols (&symbol_list_obstack, block, name,
- namespace, NULL, NULL, wild_match);
+ ada_add_block_symbols (&symbol_list_obstack, block, name,
+ namespace, NULL, NULL, wild_match);
/* If we found a non-function match, assume that's the one. */
if (is_nonfunction (defns_collected (&symbol_list_obstack, 0),
- num_defns_collected (&symbol_list_obstack)))
+ num_defns_collected (&symbol_list_obstack)))
goto done;
block = BLOCK_SUPERBLOCK (block);
enclosing subprogram. */
if (num_defns_collected (&symbol_list_obstack) == 0 && block_depth > 2)
add_symbols_from_enclosing_procs (&symbol_list_obstack,
- name, namespace, wild_match);
+ name, namespace, wild_match);
/* If we found ANY matches among non-global symbols, we're done. */
/* Now add symbols from all global blocks: symbol tables, minimal symbol
tables, and psymtab's. */
- ALL_SYMTABS (objfile, s)
+ ALL_PRIMARY_SYMTABS (objfile, s)
{
QUIT;
- if (!s->primary)
- continue;
bv = BLOCKVECTOR (s);
block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
- ada_add_block_symbols (&symbol_list_obstack, block, name, namespace,
- objfile, s, wild_match);
+ ada_add_block_symbols (&symbol_list_obstack, block, name, namespace,
+ objfile, s, wild_match);
}
if (namespace == VAR_DOMAIN)
ada_add_block_symbols (&symbol_list_obstack, block,
SYMBOL_LINKAGE_NAME (msymbol),
namespace, objfile, s, wild_match);
-
+
if (num_defns_collected (&symbol_list_obstack) == ndefns0)
{
block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
bv = BLOCKVECTOR (s);
block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
ada_add_block_symbols (&symbol_list_obstack, block, name,
- namespace, objfile, s, wild_match);
+ namespace, objfile, s, wild_match);
}
}
if (num_defns_collected (&symbol_list_obstack) == 0)
{
- ALL_SYMTABS (objfile, s)
+ ALL_PRIMARY_SYMTABS (objfile, s)
{
QUIT;
- if (!s->primary)
- continue;
bv = BLOCKVECTOR (s);
block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
- ada_add_block_symbols (&symbol_list_obstack, block, name, namespace,
- objfile, s, wild_match);
+ ada_add_block_symbols (&symbol_list_obstack, block, name, namespace,
+ objfile, s, wild_match);
}
ALL_PSYMTABS (objfile, ps)
if (!s->primary)
continue;
block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
- ada_add_block_symbols (&symbol_list_obstack, block, name,
- namespace, objfile, s, wild_match);
+ ada_add_block_symbols (&symbol_list_obstack, block, name,
+ namespace, objfile, s, wild_match);
}
}
}
cache_symbol (name0, namespace, NULL, NULL, NULL);
if (ndefns == 1 && cacheIfUnique)
- cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block,
- (*results)[0].symtab);
+ cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block,
+ (*results)[0].symtab);
- ndefns = remove_out_of_scope_renamings (*results, ndefns,
- (struct block *) block0);
+ ndefns = remove_out_of_scope_renamings (*results, ndefns, block0);
return ndefns;
}
/* Return a symbol in DOMAIN matching NAME, in BLOCK0 and enclosing
scope and in global scopes, or NULL if none. NAME is folded and
encoded first. Otherwise, the result is as for ada_lookup_symbol_list,
- but is disambiguated by user query if needed. *IS_A_FIELD_OF_THIS is
- set to 0 and *SYMTAB is set to the symbol table in which the symbol
- was found (in both cases, these assignments occur only if the
- pointers are non-null). */
-
+ choosing the first symbol if there are multiple choices.
+ *IS_A_FIELD_OF_THIS is set to 0 and *SYMTAB is set to the symbol
+ table in which the symbol was found (in both cases, these
+ assignments occur only if the pointers are non-null). */
struct symbol *
ada_lookup_symbol (const char *name, const struct block *block0,
domain_enum namespace, int *is_a_field_of_this,
- struct symtab **symtab)
+ struct symtab **symtab)
{
struct ada_symbol_info *candidates;
int n_candidates;
if (n_candidates == 0)
return NULL;
- else if (n_candidates != 1)
- user_select_syms (candidates, n_candidates, 1);
if (is_a_field_of_this != NULL)
*is_a_field_of_this = 0;
- if (symtab != NULL)
+ if (symtab != NULL)
{
*symtab = candidates[0].symtab;
- if (*symtab == NULL && candidates[0].block != NULL)
- {
- struct objfile *objfile;
- struct symtab *s;
- struct block *b;
- struct blockvector *bv;
-
- /* Search the list of symtabs for one which contains the
- address of the start of this block. */
- ALL_SYMTABS (objfile, s)
- {
- bv = BLOCKVECTOR (s);
- b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
- if (BLOCK_START (b) <= BLOCK_START (candidates[0].block)
- && BLOCK_END (b) > BLOCK_START (candidates[0].block))
- {
- *symtab = s;
- return fixup_symbol_section (candidates[0].sym, objfile);
- }
- return fixup_symbol_section (candidates[0].sym, NULL);
- }
- }
- }
+ if (*symtab == NULL && candidates[0].block != NULL)
+ {
+ struct objfile *objfile;
+ struct symtab *s;
+ struct block *b;
+ struct blockvector *bv;
+
+ /* Search the list of symtabs for one which contains the
+ address of the start of this block. */
+ ALL_PRIMARY_SYMTABS (objfile, s)
+ {
+ bv = BLOCKVECTOR (s);
+ b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+ if (BLOCK_START (b) <= BLOCK_START (candidates[0].block)
+ && BLOCK_END (b) > BLOCK_START (candidates[0].block))
+ {
+ *symtab = s;
+ return fixup_symbol_section (candidates[0].sym, objfile);
+ }
+ }
+ /* FIXME: brobecker/2004-11-12: I think that we should never
+ reach this point. I don't see a reason why we would not
+ find a symtab for a given block, so I suggest raising an
+ internal_error exception here. Otherwise, we end up
+ returning a symbol but no symtab, which certain parts of
+ the code that rely (indirectly) on this function do not
+ expect, eventually causing a SEGV. */
+ return fixup_symbol_section (candidates[0].sym, NULL);
+ }
+ }
return candidates[0].sym;
}
static struct symbol *
ada_lookup_symbol_nonlocal (const char *name,
- const char *linkage_name,
- const struct block *block,
- const domain_enum domain,
- struct symtab **symtab)
+ const char *linkage_name,
+ const struct block *block,
+ const domain_enum domain, struct symtab **symtab)
{
if (linkage_name == NULL)
linkage_name = name;
- return ada_lookup_symbol (linkage_name, block_static_block (block), domain,
- NULL, symtab);
+ return ada_lookup_symbol (linkage_name, block_static_block (block), domain,
+ NULL, symtab);
}
names (e.g., XVE) are not included here. Currently, the possible suffixes
are given by either of the regular expression:
- (__[0-9]+)?\.[0-9]+ [nested subprogram suffix, on platforms such as Linux]
+ (__[0-9]+)?[.$][0-9]+ [nested subprogram suffix, on platforms such
+ as GNU/Linux]
___[0-9]+ [nested subprogram suffix, on platforms such as HP/UX]
- (X[nb]*)?((\$|__)[0-9](_?[0-9]+)|___(LJM|X([FDBUP].*|R[^T]?)))?$
+ _E[0-9]+[bs]$ [protected object entry suffixes]
+ (X[nb]*)?((\$|__)[0-9](_?[0-9]+)|___(JM|LJM|X([FDBUP].*|R[^T]?)))?$
*/
static int
return 1;
}
- if (matching[0] == '.')
+ if (matching[0] == '.' || matching[0] == '$')
{
matching += 1;
while (isdigit (matching[0]))
return 1;
}
+#if 0
+ /* FIXME: brobecker/2005-09-23: Protected Object subprograms end
+ with a N at the end. Unfortunately, the compiler uses the same
+ convention for other internal types it creates. So treating
+ all entity names that end with an "N" as a name suffix causes
+ some regressions. For instance, consider the case of an enumerated
+ type. To support the 'Image attribute, it creates an array whose
+ name ends with N.
+ Having a single character like this as a suffix carrying some
+ information is a bit risky. Perhaps we should change the encoding
+ to be something like "_N" instead. In the meantime, do not do
+ the following check. */
+ /* Protected Object Subprograms */
+ if (len == 1 && str [0] == 'N')
+ return 1;
+#endif
+
+ /* _E[0-9]+[bs]$ */
+ if (len > 3 && str[0] == '_' && str [1] == 'E' && isdigit (str[2]))
+ {
+ matching = str + 3;
+ while (isdigit (matching[0]))
+ matching += 1;
+ if ((matching[0] == 'b' || matching[0] == 's')
+ && matching [1] == '\0')
+ return 1;
+ }
+
/* ??? We should not modify STR directly, as we are doing below. This
is fine in this case, but may become problematic later if we find
that this alternative did not work, and want to try matching
return 0;
if (str[2] == '_')
{
+ if (strcmp (str + 3, "JM") == 0)
+ return 1;
+ /* FIXME: brobecker/2004-09-30: GNAT will soon stop using
+ the LJM suffix in favor of the JM one. But we will
+ still accept LJM as a valid suffix for a reasonable
+ amount of time, just to allow ourselves to debug programs
+ compiled using an older version of GNAT. */
if (strcmp (str + 3, "LJM") == 0)
return 1;
if (str[3] != 'X')
return 0;
- if (str[4] == 'F' || str[4] == 'D' || str[4] == 'B' ||
- str[4] == 'U' || str[4] == 'P')
+ if (str[4] == 'F' || str[4] == 'D' || str[4] == 'B'
+ || str[4] == 'U' || str[4] == 'P')
return 1;
if (str[4] == 'R' && str[5] != 'T')
return 1;
return (str[0] == '\0');
}
+/* Return non-zero if NAME0 is a valid match when doing wild matching.
+ Certain symbols appear at first to match, except that they turn out
+ not to follow the Ada encoding and hence should not be used as a wild
+ match of a given pattern. */
+
+static int
+is_valid_name_for_wild_match (const char *name0)
+{
+ const char *decoded_name = ada_decode (name0);
+ int i;
+
+ for (i=0; decoded_name[i] != '\0'; i++)
+ if (isalpha (decoded_name[i]) && !islower (decoded_name[i]))
+ return 0;
+
+ return 1;
+}
+
/* 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
Ada programs. A corollary is that the symbol names in the dwarf-2
data should match the names found in the symbol table. I therefore
consider this issue as a compiler defect.
-
+
Until the compiler is properly fixed, we work-around the problem
by ignoring such suffixes during the match. We do so by making
a copy of PATN0 and NAME0, and then by stripping such a suffix
{
if (strncmp (patn, name, patn_len) == 0
&& is_name_suffix (name + patn_len))
- return 1;
+ return (is_valid_name_for_wild_match (name0));
do
{
name += 1;
static void
ada_add_block_symbols (struct obstack *obstackp,
- struct block *block, const char *name,
+ struct block *block, const char *name,
domain_enum domain, struct objfile *objfile,
struct symtab *symtab, int wild)
{
{
struct symbol *sym;
ALL_BLOCK_SYMBOLS (block, iter, sym)
- {
- if (SYMBOL_DOMAIN (sym) == domain &&
- wild_match (name, name_len, SYMBOL_LINKAGE_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:
- case LOC_COMPUTED_ARG:
- arg_sym = sym;
- break;
- case LOC_UNRESOLVED:
- continue;
- default:
- found_sym = 1;
- add_defn_to_vec (obstackp,
- fixup_symbol_section (sym, objfile),
- block, symtab);
- break;
- }
- }
- }
+ {
+ if (SYMBOL_DOMAIN (sym) == domain
+ && wild_match (name, name_len, SYMBOL_LINKAGE_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:
+ case LOC_COMPUTED_ARG:
+ arg_sym = sym;
+ break;
+ case LOC_UNRESOLVED:
+ continue;
+ default:
+ found_sym = 1;
+ add_defn_to_vec (obstackp,
+ fixup_symbol_section (sym, objfile),
+ block, symtab);
+ break;
+ }
+ }
+ }
}
else
{
ALL_BLOCK_SYMBOLS (block, iter, sym)
- {
- if (SYMBOL_DOMAIN (sym) == domain)
- {
- int cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym), name_len);
- if (cmp == 0
- && is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len))
- {
- switch (SYMBOL_CLASS (sym))
- {
- case LOC_ARG:
- case LOC_LOCAL_ARG:
- case LOC_REF_ARG:
- case LOC_REGPARM:
- case LOC_REGPARM_ADDR:
- case LOC_BASEREG_ARG:
- case LOC_COMPUTED_ARG:
- arg_sym = sym;
- break;
- case LOC_UNRESOLVED:
- break;
- default:
- found_sym = 1;
- add_defn_to_vec (obstackp,
- fixup_symbol_section (sym, objfile),
- block, symtab);
- break;
- }
- }
- }
- }
+ {
+ if (SYMBOL_DOMAIN (sym) == domain)
+ {
+ int cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym), name_len);
+ if (cmp == 0
+ && is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len))
+ {
+ switch (SYMBOL_CLASS (sym))
+ {
+ case LOC_ARG:
+ case LOC_LOCAL_ARG:
+ case LOC_REF_ARG:
+ case LOC_REGPARM:
+ case LOC_REGPARM_ADDR:
+ case LOC_BASEREG_ARG:
+ case LOC_COMPUTED_ARG:
+ arg_sym = sym;
+ break;
+ case LOC_UNRESOLVED:
+ break;
+ default:
+ found_sym = 1;
+ add_defn_to_vec (obstackp,
+ fixup_symbol_section (sym, objfile),
+ block, symtab);
+ break;
+ }
+ }
+ }
+ }
}
if (!found_sym && arg_sym != NULL)
{
- add_defn_to_vec (obstackp,
- fixup_symbol_section (arg_sym, objfile),
- block, symtab);
+ add_defn_to_vec (obstackp,
+ fixup_symbol_section (arg_sym, objfile),
+ block, symtab);
}
if (!wild)
found_sym = 0;
ALL_BLOCK_SYMBOLS (block, iter, sym)
- {
- if (SYMBOL_DOMAIN (sym) == domain)
- {
- int cmp;
-
- cmp = (int) '_' - (int) SYMBOL_LINKAGE_NAME (sym)[0];
- if (cmp == 0)
- {
- cmp = strncmp ("_ada_", SYMBOL_LINKAGE_NAME (sym), 5);
- if (cmp == 0)
- cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym) + 5,
- name_len);
- }
-
- if (cmp == 0
- && is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len + 5))
- {
- switch (SYMBOL_CLASS (sym))
- {
- case LOC_ARG:
- case LOC_LOCAL_ARG:
- case LOC_REF_ARG:
- case LOC_REGPARM:
- case LOC_REGPARM_ADDR:
- case LOC_BASEREG_ARG:
- case LOC_COMPUTED_ARG:
- arg_sym = sym;
- break;
- case LOC_UNRESOLVED:
- break;
- default:
- found_sym = 1;
- add_defn_to_vec (obstackp,
- fixup_symbol_section (sym, objfile),
- block, symtab);
- break;
- }
- }
- }
- end_loop2: ;
- }
+ {
+ if (SYMBOL_DOMAIN (sym) == domain)
+ {
+ int cmp;
+
+ cmp = (int) '_' - (int) SYMBOL_LINKAGE_NAME (sym)[0];
+ if (cmp == 0)
+ {
+ cmp = strncmp ("_ada_", SYMBOL_LINKAGE_NAME (sym), 5);
+ if (cmp == 0)
+ cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym) + 5,
+ name_len);
+ }
+
+ if (cmp == 0
+ && is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len + 5))
+ {
+ switch (SYMBOL_CLASS (sym))
+ {
+ case LOC_ARG:
+ case LOC_LOCAL_ARG:
+ case LOC_REF_ARG:
+ case LOC_REGPARM:
+ case LOC_REGPARM_ADDR:
+ case LOC_BASEREG_ARG:
+ case LOC_COMPUTED_ARG:
+ arg_sym = sym;
+ break;
+ case LOC_UNRESOLVED:
+ break;
+ default:
+ found_sym = 1;
+ add_defn_to_vec (obstackp,
+ fixup_symbol_section (sym, objfile),
+ block, symtab);
+ break;
+ }
+ }
+ }
+ }
/* NOTE: This really shouldn't be needed for _ada_ symbols.
They aren't parameters, right? */
if (!found_sym && arg_sym != NULL)
{
add_defn_to_vec (obstackp,
- fixup_symbol_section (arg_sym, objfile),
- block, symtab);
+ fixup_symbol_section (arg_sym, objfile),
+ block, symtab);
}
}
}
\f
-#ifdef GNAT_GDB
-
- /* Symbol Completion */
-
-/* If SYM_NAME is a completion candidate for TEXT, return this symbol
- name in a form that's appropriate for the completion. The result
- does not need to be deallocated, but is only good until the next call.
+ /* Field Access */
- TEXT_LEN is equal to the length of TEXT.
- Perform a wild match if WILD_MATCH is set.
- ENCODED should be set if TEXT represents the start of a symbol name
- in its encoded form. */
+/* True if field number FIELD_NUM in struct or union type TYPE is supposed
+ to be invisible to users. */
-static const char *
-symbol_completion_match (const char *sym_name,
- const char *text, int text_len,
- int wild_match, int encoded)
+int
+ada_is_ignored_field (struct type *type, int field_num)
{
- char *result;
- const int verbatim_match = (text[0] == '<');
- int match = 0;
-
- if (verbatim_match)
+ if (field_num < 0 || field_num > TYPE_NFIELDS (type))
+ return 1;
+ else
{
- /* Strip the leading angle bracket. */
- text = text + 1;
- text_len--;
+ const char *name = TYPE_FIELD_NAME (type, field_num);
+ return (name == NULL
+ || (name[0] == '_' && strncmp (name, "_parent", 7) != 0));
}
+}
- /* First, test against the fully qualified name of the symbol. */
+/* True iff TYPE has a tag field. If REFOK, then TYPE may also be a
+ pointer or reference type whose ultimate target has a tag field. */
- if (strncmp (sym_name, text, text_len) == 0)
- match = 1;
+int
+ada_is_tagged_type (struct type *type, int refok)
+{
+ return (ada_lookup_struct_elt_type (type, "_tag", refok, 1, NULL) != NULL);
+}
- if (match && !encoded)
- {
- /* One needed check before declaring a positive match is to verify
- that iff we are doing a verbatim match, the decoded version
- of the symbol name starts with '<'. Otherwise, this symbol name
- is not a suitable completion. */
- const char *sym_name_copy = sym_name;
- int has_angle_bracket;
-
- sym_name = ada_decode (sym_name);
- has_angle_bracket = (sym_name [0] == '<');
- match = (has_angle_bracket == verbatim_match);
- sym_name = sym_name_copy;
- }
+/* True iff TYPE represents the type of X'Tag */
- if (match && !verbatim_match)
+int
+ada_is_tag_type (struct type *type)
+{
+ if (type == NULL || TYPE_CODE (type) != TYPE_CODE_PTR)
+ return 0;
+ else
{
- /* When doing non-verbatim match, another check that needs to
- be done is to verify that the potentially matching symbol name
- does not include capital letters, because the ada-mode would
- not be able to understand these symbol names without the
- angle bracket notation. */
- const char *tmp;
-
- for (tmp = sym_name; *tmp != '\0' && !isupper (*tmp); tmp++);
- if (*tmp != '\0')
- match = 0;
+ const char *name = ada_type_name (TYPE_TARGET_TYPE (type));
+ return (name != NULL
+ && strcmp (name, "ada__tags__dispatch_table") == 0);
}
+}
- /* Second: Try wild matching... */
-
- if (!match && wild_match)
- {
- /* Since we are doing wild matching, this means that TEXT
- may represent an unqualified symbol name. We therefore must
- also compare TEXT against the unqualified name of the symbol. */
- sym_name = ada_unqualified_name (ada_decode (sym_name));
+/* The type of the tag on VAL. */
- if (strncmp (sym_name, text, text_len) == 0)
- match = 1;
- }
+struct type *
+ada_tag_type (struct value *val)
+{
+ return ada_lookup_struct_elt_type (value_type (val), "_tag", 1, 0, NULL);
+}
- /* Finally: If we found a mach, prepare the result to return. */
+/* The value of the tag on VAL. */
- if (!match)
- return NULL;
+struct value *
+ada_value_tag (struct value *val)
+{
+ return ada_value_struct_elt (val, "_tag", 0);
+}
- if (verbatim_match)
- sym_name = add_angle_brackets (sym_name);
+/* The value of the tag on the object of type TYPE whose contents are
+ saved at VALADDR, if it is non-null, or is at memory address
+ ADDRESS. */
- if (!encoded)
- sym_name = ada_decode (sym_name);
+static struct value *
+value_tag_from_contents_and_address (struct type *type,
+ const gdb_byte *valaddr,
+ CORE_ADDR address)
+{
+ int tag_byte_offset, dummy1, dummy2;
+ struct type *tag_type;
+ if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
+ NULL, NULL, NULL))
+ {
+ const gdb_byte *valaddr1 = ((valaddr == NULL)
+ ? NULL
+ : valaddr + tag_byte_offset);
+ CORE_ADDR address1 = (address == 0) ? 0 : address + tag_byte_offset;
- return sym_name;
+ return value_from_contents_and_address (tag_type, valaddr1, address1);
+ }
+ return NULL;
}
-/* A companion function to ada_make_symbol_completion_list().
- Check if SYM_NAME represents a symbol which name would be suitable
- to complete TEXT (TEXT_LEN is the length of TEXT), in which case
- it is appended at the end of the given string vector SV.
+static struct type *
+type_from_tag (struct value *tag)
+{
+ const char *type_name = ada_tag_name (tag);
+ if (type_name != NULL)
+ return ada_find_any_type (ada_encode (type_name));
+ return NULL;
+}
- ORIG_TEXT is the string original string from the user command
- that needs to be completed. WORD is the entire command on which
- completion should be performed. These two parameters are used to
- determine which part of the symbol name should be added to the
- completion vector.
- if WILD_MATCH is set, then wild matching is performed.
- ENCODED should be set if TEXT represents a symbol name in its
- encoded formed (in which case the completion should also be
- encoded). */
-
-static void
-symbol_completion_add (struct string_vector *sv,
- const char *sym_name,
- const char *text, int text_len,
- const char *orig_text, const char *word,
- int wild_match, int encoded)
+struct tag_args
{
- const char *match = symbol_completion_match (sym_name, text, text_len,
- wild_match, encoded);
- char *completion;
+ struct value *tag;
+ char *name;
+};
- if (match == NULL)
- return;
- /* We found a match, so add the appropriate completion to the given
- string vector. */
+static int ada_tag_name_1 (void *);
+static int ada_tag_name_2 (struct tag_args *);
- if (word == orig_text)
- {
- completion = xmalloc (strlen (match) + 5);
- strcpy (completion, match);
- }
- else if (word > orig_text)
- {
- /* Return some portion of sym_name. */
- completion = xmalloc (strlen (match) + 5);
- strcpy (completion, match + (word - orig_text));
- }
- else
- {
- /* Return some of ORIG_TEXT plus sym_name. */
- completion = xmalloc (strlen (match) + (orig_text - word) + 5);
- strncpy (completion, word, orig_text - word);
- completion[orig_text - word] = '\0';
- strcat (completion, match);
- }
+/* Wrapper function used by ada_tag_name. Given a struct tag_args*
+ value ARGS, sets ARGS->name to the tag name of ARGS->tag.
+ The value stored in ARGS->name is valid until the next call to
+ ada_tag_name_1. */
- string_vector_append (sv, completion);
+static int
+ada_tag_name_1 (void *args0)
+{
+ struct tag_args *args = (struct tag_args *) args0;
+ static char name[1024];
+ char *p;
+ struct value *val;
+ args->name = NULL;
+ val = ada_value_struct_elt (args->tag, "tsd", 1);
+ if (val == NULL)
+ return ada_tag_name_2 (args);
+ val = ada_value_struct_elt (val, "expanded_name", 1);
+ if (val == NULL)
+ return 0;
+ read_memory_string (value_as_address (val), name, sizeof (name) - 1);
+ for (p = name; *p != '\0'; p += 1)
+ if (isalpha (*p))
+ *p = tolower (*p);
+ args->name = name;
+ return 0;
}
-/* Return a list of possible symbol names completing TEXT0. The list
- is NULL terminated. WORD is the entire command on which completion
- is made. */
-
-char **
-ada_make_symbol_completion_list (const char *text0, const char *word)
+/* Utility function for ada_tag_name_1 that tries the second
+ representation for the dispatch table (in which there is no
+ explicit 'tsd' field in the referent of the tag pointer, and instead
+ the tsd pointer is stored just before the dispatch table. */
+
+static int
+ada_tag_name_2 (struct tag_args *args)
{
- /* Note: This function is almost a copy of make_symbol_completion_list(),
- except it has been adapted for Ada. It is somewhat of a shame to
- duplicate so much code, but we don't really have the infrastructure
- yet to develop a language-aware version of he symbol completer... */
- char *text;
- int text_len;
- int wild_match;
- int encoded;
- struct string_vector result = xnew_string_vector (128);
- struct symbol *sym;
- struct symtab *s;
- struct partial_symtab *ps;
- struct minimal_symbol *msymbol;
- struct objfile *objfile;
- struct block *b, *surrounding_static_block = 0;
- int i;
- struct dict_iterator iter;
+ struct type *info_type;
+ static char name[1024];
+ char *p;
+ struct value *val, *valp;
- if (text0[0] == '<')
- {
- text = xstrdup (text0);
- make_cleanup (xfree, text);
- text_len = strlen (text);
- wild_match = 0;
- encoded = 1;
- }
- else
- {
- text = xstrdup (ada_encode (text0));
- make_cleanup (xfree, text);
- text_len = strlen (text);
- for (i = 0; i < text_len; i++)
- text[i] = tolower (text[i]);
+ args->name = NULL;
+ info_type = ada_find_any_type ("ada__tags__type_specific_data");
+ if (info_type == NULL)
+ return 0;
+ info_type = lookup_pointer_type (lookup_pointer_type (info_type));
+ valp = value_cast (info_type, args->tag);
+ if (valp == NULL)
+ return 0;
+ val = value_ind (value_add (valp, value_from_longest (builtin_type_int, -1)));
+ if (val == NULL)
+ return 0;
+ val = ada_value_struct_elt (val, "expanded_name", 1);
+ if (val == NULL)
+ return 0;
+ read_memory_string (value_as_address (val), name, sizeof (name) - 1);
+ for (p = name; *p != '\0'; p += 1)
+ if (isalpha (*p))
+ *p = tolower (*p);
+ args->name = name;
+ return 0;
+}
- /* FIXME: brobecker/2003-09-17: When we get rid of ADA_RETAIN_DOTS,
- we can restrict the wild_match check to searching "__" only. */
- wild_match = (strstr (text0, "__") == NULL
- && strchr (text0, '.') == NULL);
- encoded = (strstr (text0, "__") != NULL);
- }
+/* The type name of the dynamic type denoted by the 'tag value TAG, as
+ * a C string. */
- /* First, look at the partial symtab symbols. */
- ALL_PSYMTABS (objfile, ps)
- {
- struct partial_symbol **psym;
+const char *
+ada_tag_name (struct value *tag)
+{
+ struct tag_args args;
+ if (!ada_is_tag_type (value_type (tag)))
+ return NULL;
+ args.tag = tag;
+ args.name = NULL;
+ catch_errors (ada_tag_name_1, &args, NULL, RETURN_MASK_ALL);
+ return args.name;
+}
- /* If the psymtab's been read in we'll get it when we search
- through the blockvector. */
- if (ps->readin)
- continue;
+/* The parent type of TYPE, or NULL if none. */
- for (psym = objfile->global_psymbols.list + ps->globals_offset;
- psym < (objfile->global_psymbols.list + ps->globals_offset
- + ps->n_global_syms);
- psym++)
- {
- QUIT;
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (*psym),
- text, text_len, text0, word,
- wild_match, encoded);
- }
+struct type *
+ada_parent_type (struct type *type)
+{
+ int i;
- for (psym = objfile->static_psymbols.list + ps->statics_offset;
- psym < (objfile->static_psymbols.list + ps->statics_offset
- + ps->n_static_syms);
- psym++)
- {
- QUIT;
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (*psym),
- text, text_len, text0, word,
- wild_match, encoded);
- }
- }
+ type = ada_check_typedef (type);
- /* At this point scan through the misc symbol vectors and add each
- symbol you find to the list. Eventually we want to ignore
- anything that isn't a text symbol (everything else will be
- handled by the psymtab code above). */
+ if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
+ return NULL;
- ALL_MSYMBOLS (objfile, msymbol)
- {
- QUIT;
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (msymbol),
- text, text_len, text0, word,
- wild_match, encoded);
- }
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
+ if (ada_is_parent_field (type, i))
+ return ada_check_typedef (TYPE_FIELD_TYPE (type, i));
- /* Search upwards from currently selected frame (so that we can
- complete on local vars. */
+ return NULL;
+}
- for (b = get_selected_block (0); b != NULL; b = BLOCK_SUPERBLOCK (b))
- {
- if (!BLOCK_SUPERBLOCK (b))
- surrounding_static_block = b; /* For elmin of dups */
+/* True iff field number FIELD_NUM of structure type TYPE contains the
+ parent-type (inherited) fields of a derived type. Assumes TYPE is
+ a structure type with at least FIELD_NUM+1 fields. */
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (sym),
- text, text_len, text0, word,
- wild_match, encoded);
- }
- }
+int
+ada_is_parent_field (struct type *type, int field_num)
+{
+ const char *name = TYPE_FIELD_NAME (ada_check_typedef (type), field_num);
+ return (name != NULL
+ && (strncmp (name, "PARENT", 6) == 0
+ || strncmp (name, "_parent", 7) == 0));
+}
+
+/* True iff field number FIELD_NUM of structure type TYPE is a
+ transparent wrapper field (which should be silently traversed when doing
+ field selection and flattened when printing). Assumes TYPE is a
+ structure type with at least FIELD_NUM+1 fields. Such fields are always
+ structures. */
- /* Go through the symtabs and check the externs and statics for
- symbols which match. */
+int
+ada_is_wrapper_field (struct type *type, int field_num)
+{
+ const char *name = TYPE_FIELD_NAME (type, field_num);
+ return (name != NULL
+ && (strncmp (name, "PARENT", 6) == 0
+ || strcmp (name, "REP") == 0
+ || strncmp (name, "_parent", 7) == 0
+ || name[0] == 'S' || name[0] == 'R' || name[0] == 'O'));
+}
- ALL_SYMTABS (objfile, s)
- {
- QUIT;
- b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (sym),
- text, text_len, text0, word,
- wild_match, encoded);
- }
- }
+/* 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. */
- ALL_SYMTABS (objfile, s)
- {
- QUIT;
- b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
- /* Don't do this block twice. */
- if (b == surrounding_static_block)
- continue;
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- symbol_completion_add (&result, SYMBOL_LINKAGE_NAME (sym),
- text, text_len, text0, word,
- wild_match, encoded);
- }
- }
+int
+ada_is_variant_part (struct type *type, int 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)));
+}
- /* Append the closing NULL entry. */
- string_vector_append (&result, NULL);
+/* 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. */
- return (result.array);
+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, 1, NULL);
+ if (type == NULL)
+ return builtin_type_int;
+ else
+ return type;
}
-#endif /* GNAT_GDB */
-\f
-#ifdef GNAT_GDB
- /* Breakpoint-related */
+/* Assuming that TYPE is the type of a variant wrapper, and FIELD_NUM is a
+ valid field number within it, returns 1 iff field FIELD_NUM of TYPE
+ represents a 'when others' clause; otherwise 0. */
-/* Import message from symtab.c. */
-extern char no_symtab_msg[];
+int
+ada_is_others_clause (struct type *type, int field_num)
+{
+ const char *name = TYPE_FIELD_NAME (type, field_num);
+ return (name != NULL && name[0] == 'O');
+}
-/* 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. */
+/* Assuming that TYPE0 is the type of the variant part of a record,
+ returns the name of the discriminant controlling the variant.
+ The value is valid until the next call to ada_variant_discrim_name. */
char *
-ada_start_decode_line_1 (char *line)
+ada_variant_discrim_name (struct type *type0)
{
- /* 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;
- for (p = line; *p != '\000' && *p != ' ' && *p != ':'; p += 1)
- ;
- return p;
-}
-
-/* *SPEC points to a function and line number spec (as in a break
- command), following any initial file name specification.
-
- Return all symbol table/line specfications (sals) consistent with the
- information in *SPEC and FILE_TABLE in the following sense:
- + FILE_TABLE is null, or the sal refers to a line in the file
- named by FILE_TABLE.
- + If *SPEC points to an argument with a trailing ':LINENUM',
- then the sal refers to that line (or one following it as closely as
- possible).
- + If *SPEC does not start with '*', the sal is in a function with
- that name.
-
- Returns with 0 elements if no matching non-minimal symbols found.
-
- If *SPEC begins with a function name of the form <NAME>, then NAME
- is taken as a literal name; otherwise the function name is subject
- to the usual encoding.
-
- *SPEC is updated to point after the function/line number specification.
-
- FUNFIRSTLINE is non-zero if we desire the first line of real code
- in each function.
-
- If CANONICAL is non-NULL, and if any of the sals require a
- 'canonical line spec', then *CANONICAL is set to point to an array
- of strings, corresponding to and equal in length to the returned
- list of sals, such that (*CANONICAL)[i] is non-null and contains a
- canonical line spec for the ith returned sal, if needed. If no
- canonical line specs are required and CANONICAL is non-null,
- *CANONICAL is set to NULL.
-
- A 'canonical line spec' is simply a name (in the format of the
- breakpoint command) that uniquely identifies a breakpoint position,
- with no further contextual information or user selection. It is
- needed whenever the file name, function name, and line number
- information supplied is insufficient for this unique
- identification. Currently overloaded functions, the name '*',
- or static functions without a filename yield a canonical line spec.
- The array and the line spec strings are allocated on the heap; it
- 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)
-{
- struct ada_symbol_info *symbols;
- const 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;
- int is_quoted;
-
- int len;
- char *lower_name;
- char *unquoted_name;
+ static char *result = NULL;
+ static size_t result_len = 0;
+ struct type *type;
+ const char *name;
+ const char *discrim_end;
+ const char *discrim_start;
- if (file_table == NULL)
- block = block_static_block (get_selected_block (0));
+ if (TYPE_CODE (type0) == TYPE_CODE_PTR)
+ type = TYPE_TARGET_TYPE (type0);
else
- block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (file_table), STATIC_BLOCK);
-
- if (canonical != NULL)
- *canonical = (char **) NULL;
+ type = type0;
- is_quoted = (**spec && strchr (get_gdb_completer_quote_characters (),
- **spec) != NULL);
+ name = ada_type_name (type);
- name = *spec;
- if (**spec == '*')
- *spec += 1;
- else
- {
- if (is_quoted)
- *spec = skip_quoted (*spec);
- while (**spec != '\000' &&
- !strchr (ada_completer_word_break_characters, **spec))
- *spec += 1;
- }
- len = *spec - name;
+ if (name == NULL || name[0] == '\000')
+ return "";
- line_num = -1;
- if (file_table != NULL && (*spec)[0] == ':' && isdigit ((*spec)[1]))
+ for (discrim_end = name + strlen (name) - 6; discrim_end != name;
+ discrim_end -= 1)
{
- line_num = strtol (*spec + 1, spec, 10);
- while (**spec == ' ' || **spec == '\t')
- *spec += 1;
+ if (strncmp (discrim_end, "___XVN", 6) == 0)
+ break;
}
+ if (discrim_end == name)
+ return "";
- if (name[0] == '*')
+ for (discrim_start = discrim_end; discrim_start != name + 3;
+ discrim_start -= 1)
{
- if (line_num == -1)
- error ("Wild-card function with no line number or file name.");
-
- return ada_sals_for_line (file_table->filename, line_num,
- funfirstline, canonical, 0);
+ if (discrim_start == name + 1)
+ return "";
+ if ((discrim_start > name + 3
+ && strncmp (discrim_start - 3, "___", 3) == 0)
+ || discrim_start[-1] == '.')
+ break;
}
- if (name[0] == '\'')
- {
- name += 1;
- len -= 2;
- }
-
- if (name[0] == '<')
- {
- 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);
- memcpy (unquoted_name, name, len);
- unquoted_name[len] = '\000';
- 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_encode (lower_name), block,
- VAR_DOMAIN, &symbols);
- if (n_matches == 0)
- n_matches = ada_lookup_symbol_list (unquoted_name, block,
- VAR_DOMAIN, &symbols);
- if (n_matches == 0 && line_num >= 0)
- error ("No line number information found for %s.", unquoted_name);
- else if (n_matches == 0)
- {
-#ifdef HPPA_COMPILER_BUG
- /* FIXME: See comment in symtab.c::decode_line_1 */
-#undef volatile
- volatile struct symtab_and_line val;
-#define volatile /*nothing */
-#else
- struct symtab_and_line val;
-#endif
- struct minimal_symbol *msymbol;
-
- init_sal (&val);
+ GROW_VECT (result, result_len, discrim_end - discrim_start + 1);
+ strncpy (result, discrim_start, discrim_end - discrim_start);
+ result[discrim_end - discrim_start] = '\0';
+ return result;
+}
- msymbol = NULL;
- if (lower_name != NULL)
- msymbol = ada_lookup_simple_minsym (ada_encode (lower_name));
- if (msymbol == NULL)
- msymbol = ada_lookup_simple_minsym (unquoted_name);
- if (msymbol != NULL)
- {
- val.pc = SYMBOL_VALUE_ADDRESS (msymbol);
- val.section = SYMBOL_BFD_SECTION (msymbol);
- if (funfirstline)
- {
- val.pc += DEPRECATED_FUNCTION_START_OFFSET;
- SKIP_PROLOGUE (val.pc);
- }
- selected.sals = (struct symtab_and_line *)
- xmalloc (sizeof (struct symtab_and_line));
- selected.sals[0] = val;
- selected.nelts = 1;
- return selected;
- }
+/* Scan STR for a subtype-encoded number, beginning at position K.
+ Put the position of the character just past the number scanned in
+ *NEW_K, if NEW_K!=NULL. Put the scanned number in *R, if R!=NULL.
+ Return 1 if there was a valid number at the given position, and 0
+ otherwise. A "subtype-encoded" number consists of the absolute value
+ in decimal, followed by the letter 'm' to indicate a negative number.
+ Assumes 0m does not occur. */
- if (!have_full_symbols () &&
- !have_partial_symbols () && !have_minimal_symbols ())
- error ("No symbol table is loaded. Use the \"file\" command.");
+int
+ada_scan_number (const char str[], int k, LONGEST * R, int *new_k)
+{
+ ULONGEST RU;
- error ("Function \"%s\" not defined.", unquoted_name);
- return selected; /* for lint */
- }
+ if (!isdigit (str[k]))
+ return 0;
- if (line_num >= 0)
- {
- struct symtabs_and_lines best_sal =
- find_sal_from_funcs_and_line (file_table->filename, line_num,
- symbols, n_matches);
- if (funfirstline)
- adjust_pc_past_prologue (&best_sal.sals[0].pc);
- return best_sal;
- }
- else
+ /* Do it the hard way so as not to make any assumption about
+ the relationship of unsigned long (%lu scan format code) and
+ LONGEST. */
+ RU = 0;
+ while (isdigit (str[k]))
{
- selected.nelts =
- user_select_syms (symbols, n_matches, n_matches);
+ RU = RU * 10 + (str[k] - '0');
+ k += 1;
}
- 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);
-
- i = 0;
- while (i < selected.nelts)
+ if (str[k] == 'm')
{
- if (SYMBOL_CLASS (symbols[i].sym) == LOC_BLOCK)
- selected.sals[i]
- = find_function_start_sal (symbols[i].sym, funfirstline);
- else if (SYMBOL_LINE (symbols[i].sym) != 0)
- {
- selected.sals[i].symtab =
- symbols[i].symtab
- ? symbols[i].symtab : symtab_for_sym (symbols[i].sym);
- selected.sals[i].line = SYMBOL_LINE (symbols[i].sym);
- }
- else if (line_num >= 0)
- {
- /* Ignore this choice */
- symbols[i] = symbols[selected.nelts - 1];
- selected.nelts -= 1;
- continue;
- }
- else
- error ("Line number not known for symbol \"%s\"", unquoted_name);
- i += 1;
+ if (R != NULL)
+ *R = (-(LONGEST) (RU - 1)) - 1;
+ k += 1;
}
+ else if (R != NULL)
+ *R = (LONGEST) RU;
- if (canonical != NULL && (line_num >= 0 || n_matches > 1))
- {
- *canonical = (char **) xmalloc (sizeof (char *) * selected.nelts);
- for (i = 0; i < selected.nelts; i += 1)
- (*canonical)[i] =
- extended_canonical_line_spec (selected.sals[i],
- SYMBOL_PRINT_NAME (symbols[i].sym));
- }
+ /* NOTE on the above: Technically, C does not say what the results of
+ - (LONGEST) RU or (LONGEST) -RU are for RU == largest positive
+ number representable as a LONGEST (although either would probably work
+ in most implementations). When RU>0, the locution in the then branch
+ above is always equivalent to the negative of RU. */
- discard_cleanups (old_chain);
- return selected;
+ if (new_k != NULL)
+ *new_k = k;
+ return 1;
}
-/* 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 the symbol fields of SYMBOLS[0 .. NSYMS-1]. */
+/* Assuming that TYPE is a variant part wrapper type (a VARIANTS field),
+ 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. */
-static struct symtabs_and_lines
-find_sal_from_funcs_and_line (const char *filename, int line_num,
- struct ada_symbol_info *symbols, int nsyms)
+int
+ada_in_variant (LONGEST val, struct type *type, int field_num)
{
- struct symtabs_and_lines sals;
- int best_index, best;
- 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 = 0;
- ALL_SYMTABS (objfile, s)
- {
- struct linetable *l;
- int ind, exact;
-
- QUIT;
+ const char *name = TYPE_FIELD_NAME (type, field_num);
+ int p;
- if (strcmp (filename, s->filename) != 0)
- continue;
- l = LINETABLE (s);
- ind = find_line_in_linetable (l, line_num, symbols, nsyms, &exact);
- if (ind >= 0)
- {
- if (exact)
+ p = 0;
+ while (1)
+ {
+ switch (name[p])
+ {
+ case '\0':
+ return 0;
+ case 'S':
{
- best_index = ind;
- best_linetable = l;
- best_symtab = s;
- goto done;
+ LONGEST W;
+ if (!ada_scan_number (name, p + 1, &W, &p))
+ return 0;
+ if (val == W)
+ return 1;
+ break;
}
- if (best == 0 || l->item[ind].line < best)
+ case 'R':
{
- best = l->item[ind].line;
- best_index = ind;
- best_linetable = l;
- best_symtab = s;
+ LONGEST L, U;
+ 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;
+ break;
}
- }
- }
+ case 'O':
+ return 1;
+ default:
+ return 0;
+ }
+ }
+}
- if (best == 0)
- error ("Line number not found in designated function.");
+/* FIXME: Lots of redundancy below. Try to consolidate. */
-done:
+/* Given a value ARG1 (offset by OFFSET bytes) of a struct or union type
+ ARG_TYPE, extract and return the value of one of its (non-static)
+ fields. FIELDNO says which field. Differs from value_primitive_field
+ only in that it can handle packed values of arbitrary type. */
+
+static struct value *
+ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+ struct type *arg_type)
+{
+ struct type *type;
- sals.nelts = 1;
- sals.sals = (struct symtab_and_line *) xmalloc (sizeof (sals.sals[0]));
+ arg_type = ada_check_typedef (arg_type);
+ type = TYPE_FIELD_TYPE (arg_type, fieldno);
- init_sal (&sals.sals[0]);
+ /* Handle packed fields. */
- 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;
+ if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
+ {
+ int bit_pos = TYPE_FIELD_BITPOS (arg_type, fieldno);
+ int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
- return sals;
+ return ada_value_primitive_packed_val (arg1, value_contents (arg1),
+ offset + bit_pos / 8,
+ bit_pos % 8, bit_size, type);
+ }
+ else
+ return value_primitive_field (arg1, offset, fieldno, arg_type);
}
-/* Return the index in LINETABLE of the best match for LINE_NUM whose
- pc falls within one of the functions denoted by the symbol fields
- of SYMBOLS[0..NSYMS-1]. Set *EXACTP to 1 if the match is exact,
- and 0 otherwise. */
+/* Find field with name NAME in object of type TYPE. If found,
+ set the following for each argument that is non-null:
+ - *FIELD_TYPE_P to the field's type;
+ - *BYTE_OFFSET_P to OFFSET + the byte offset of the field within
+ an object of that type;
+ - *BIT_OFFSET_P to the bit offset modulo byte size of the field;
+ - *BIT_SIZE_P to its size in bits if the field is packed, and
+ 0 otherwise;
+ If INDEX_P is non-null, increment *INDEX_P by the number of source-visible
+ fields up to but not including the desired field, or by the total
+ number of fields if not found. A NULL value of NAME never
+ matches; the function just counts visible fields in this case.
+
+ Returns 1 if found, 0 otherwise. */
static int
-find_line_in_linetable (struct linetable *linetable, int line_num,
- struct ada_symbol_info *symbols, int nsyms, int *exactp)
+find_struct_field (char *name, struct type *type, int offset,
+ struct type **field_type_p,
+ int *byte_offset_p, int *bit_offset_p, int *bit_size_p,
+ int *index_p)
{
- int i, len, best_index, best;
+ int i;
- if (line_num <= 0 || linetable == NULL)
- return -1;
+ type = ada_check_typedef (type);
+
+ if (field_type_p != NULL)
+ *field_type_p = NULL;
+ if (byte_offset_p != NULL)
+ *byte_offset_p = 0;
+ if (bit_offset_p != NULL)
+ *bit_offset_p = 0;
+ if (bit_size_p != NULL)
+ *bit_size_p = 0;
- len = linetable->nitems;
- for (i = 0, best_index = -1, best = 0; i < len; i += 1)
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
{
- int k;
- struct linetable_entry *item = &(linetable->item[i]);
+ int bit_pos = TYPE_FIELD_BITPOS (type, i);
+ int fld_offset = offset + bit_pos / 8;
+ char *t_field_name = TYPE_FIELD_NAME (type, i);
- for (k = 0; k < nsyms; k += 1)
+ if (t_field_name == NULL)
+ continue;
+
+ else if (name != NULL && field_name_match (t_field_name, name))
{
- if (symbols[k].sym != NULL
- && SYMBOL_CLASS (symbols[k].sym) == LOC_BLOCK
- && item->pc >= BLOCK_START (SYMBOL_BLOCK_VALUE (symbols[k].sym))
- && item->pc < BLOCK_END (SYMBOL_BLOCK_VALUE (symbols[k].sym)))
- goto candidate;
+ int bit_size = TYPE_FIELD_BITSIZE (type, i);
+ if (field_type_p != NULL)
+ *field_type_p = TYPE_FIELD_TYPE (type, i);
+ if (byte_offset_p != NULL)
+ *byte_offset_p = fld_offset;
+ if (bit_offset_p != NULL)
+ *bit_offset_p = bit_pos % 8;
+ if (bit_size_p != NULL)
+ *bit_size_p = bit_size;
+ return 1;
}
- continue;
-
- candidate:
-
- if (item->line == line_num)
+ else if (ada_is_wrapper_field (type, i))
{
- *exactp = 1;
- return i;
+ if (find_struct_field (name, TYPE_FIELD_TYPE (type, i), fld_offset,
+ field_type_p, byte_offset_p, bit_offset_p,
+ bit_size_p, index_p))
+ return 1;
}
-
- if (item->line > line_num && (best == 0 || item->line < best))
+ else if (ada_is_variant_part (type, i))
{
- best = item->line;
- best_index = i;
+ /* PNH: Wait. Do we ever execute this section, or is ARG always of
+ fixed type?? */
+ int j;
+ struct type *field_type
+ = ada_check_typedef (TYPE_FIELD_TYPE (type, i));
+
+ for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
+ {
+ if (find_struct_field (name, TYPE_FIELD_TYPE (field_type, j),
+ fld_offset
+ + TYPE_FIELD_BITPOS (field_type, j) / 8,
+ field_type_p, byte_offset_p,
+ bit_offset_p, bit_size_p, index_p))
+ return 1;
+ }
}
+ else if (index_p != NULL)
+ *index_p += 1;
}
-
- *exactp = 0;
- return best_index;
+ return 0;
}
-/* Find the smallest k >= LINE_NUM such that k is a line number in
- LINETABLE, and k falls strictly within a named function that begins at
- or before LINE_NUM. Return -1 if there is no such k. */
+/* Number of user-visible fields in record type TYPE. */
static int
-nearest_line_number_in_linetable (struct linetable *linetable, int line_num)
+num_visible_fields (struct type *type)
{
- int i, len, best;
+ int n;
+ n = 0;
+ find_struct_field (NULL, type, 0, NULL, NULL, NULL, NULL, &n);
+ return n;
+}
- if (line_num <= 0 || linetable == NULL || linetable->nitems == 0)
- return -1;
- len = linetable->nitems;
+/* Look for a field NAME in ARG. Adjust the address of ARG by OFFSET bytes,
+ and search in it assuming it has (class) type TYPE.
+ If found, return value, else return NULL.
- i = 0;
- best = INT_MAX;
- while (i < len)
+ Searches recursively through wrapper fields (e.g., '_parent'). */
+
+static struct value *
+ada_search_struct_field (char *name, struct value *arg, int offset,
+ struct type *type)
+{
+ int i;
+ type = ada_check_typedef (type);
+
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
{
- struct linetable_entry *item = &(linetable->item[i]);
+ char *t_field_name = TYPE_FIELD_NAME (type, i);
+
+ if (t_field_name == NULL)
+ continue;
+
+ else if (field_name_match (t_field_name, name))
+ return ada_value_primitive_field (arg, offset, i, type);
- if (item->line >= line_num && item->line < best)
+ else if (ada_is_wrapper_field (type, i))
{
- char *func_name;
- CORE_ADDR start, end;
+ struct value *v = /* Do not let indent join lines here. */
+ ada_search_struct_field (name, arg,
+ offset + TYPE_FIELD_BITPOS (type, i) / 8,
+ TYPE_FIELD_TYPE (type, i));
+ if (v != NULL)
+ return v;
+ }
- func_name = NULL;
- find_pc_partial_function (item->pc, &func_name, &start, &end);
+ else if (ada_is_variant_part (type, i))
+ {
+ /* PNH: Do we ever get here? See find_struct_field. */
+ int j;
+ struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type, i));
+ int var_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
- if (func_name != NULL && item->pc < end)
+ for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
{
- if (item->line == line_num)
- return line_num;
- else
- {
- struct symbol *sym =
- standard_lookup (func_name, NULL, VAR_DOMAIN);
- if (is_plausible_func_for_line (sym, line_num))
- best = item->line;
- else
- {
- do
- i += 1;
- while (i < len && linetable->item[i].pc < end);
- continue;
- }
- }
+ struct value *v = ada_search_struct_field /* Force line break. */
+ (name, arg,
+ var_offset + TYPE_FIELD_BITPOS (field_type, j) / 8,
+ TYPE_FIELD_TYPE (field_type, j));
+ if (v != NULL)
+ return v;
}
}
-
- i += 1;
}
-
- return (best == INT_MAX) ? -1 : best;
+ return NULL;
}
+static struct value *ada_index_struct_field_1 (int *, struct value *,
+ int, struct type *);
-/* Return the next higher index, k, into LINETABLE such that k > IND,
- entry k in LINETABLE has a line number equal to LINE_NUM, k
- corresponds to a PC that is in a function different from that
- corresponding to IND, and falls strictly within a named function
- that begins at a line at or preceding STARTING_LINE.
- Return -1 if there is no such k.
- IND == -1 corresponds to no function. */
-static int
-find_next_line_in_linetable (struct linetable *linetable, int line_num,
- int starting_line, int ind)
+/* Return field #INDEX in ARG, where the index is that returned by
+ * find_struct_field through its INDEX_P argument. Adjust the address
+ * of ARG by OFFSET bytes, and search in it assuming it has (class) type TYPE.
+ * If found, return value, else return NULL. */
+
+static struct value *
+ada_index_struct_field (int index, struct value *arg, int offset,
+ struct type *type)
{
- int i, len;
+ return ada_index_struct_field_1 (&index, arg, offset, type);
+}
- if (line_num <= 0 || linetable == NULL || ind >= linetable->nitems)
- return -1;
- len = linetable->nitems;
- if (ind >= 0)
- {
- CORE_ADDR start, end;
+/* Auxiliary function for ada_index_struct_field. Like
+ * ada_index_struct_field, but takes index from *INDEX_P and modifies
+ * *INDEX_P. */
- if (find_pc_partial_function (linetable->item[ind].pc,
- (char **) NULL, &start, &end))
- {
- while (ind < len && linetable->item[ind].pc < end)
- ind += 1;
- }
- else
- ind += 1;
- }
- else
- ind = 0;
+static struct value *
+ada_index_struct_field_1 (int *index_p, struct value *arg, int offset,
+ struct type *type)
+{
+ int i;
+ type = ada_check_typedef (type);
- i = ind;
- while (i < len)
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
{
- struct linetable_entry *item = &(linetable->item[i]);
-
- if (item->line >= line_num)
+ if (TYPE_FIELD_NAME (type, i) == NULL)
+ continue;
+ else if (ada_is_wrapper_field (type, i))
{
- char *func_name;
- CORE_ADDR start, end;
-
- func_name = NULL;
- find_pc_partial_function (item->pc, &func_name, &start, &end);
+ struct value *v = /* Do not let indent join lines here. */
+ ada_index_struct_field_1 (index_p, arg,
+ offset + TYPE_FIELD_BITPOS (type, i) / 8,
+ TYPE_FIELD_TYPE (type, i));
+ if (v != NULL)
+ return v;
+ }
- if (func_name != NULL && item->pc < end)
- {
- if (item->line == line_num)
- {
- struct symbol *sym =
- standard_lookup (func_name, NULL, VAR_DOMAIN);
- if (is_plausible_func_for_line (sym, starting_line))
- return i;
- else
- {
- while ((i + 1) < len && linetable->item[i + 1].pc < end)
- i += 1;
- }
- }
- }
+ else if (ada_is_variant_part (type, i))
+ {
+ /* PNH: Do we ever get here? See ada_search_struct_field,
+ find_struct_field. */
+ error (_("Cannot assign this kind of variant record"));
}
- i += 1;
+ else if (*index_p == 0)
+ return ada_value_primitive_field (arg, offset, i, type);
+ else
+ *index_p -= 1;
}
-
- return -1;
+ return NULL;
}
-/* True iff function symbol SYM starts somewhere at or before line #
- LINE_NUM. */
+/* Given ARG, a value of type (pointer or reference 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. If ARG is a pointer or reference and the field
+ is not packed, returns a reference to the field, otherwise the
+ value of the field (an lvalue if ARG is an lvalue).
-static int
-is_plausible_func_for_line (struct symbol *sym, int line_num)
-{
- struct symtab_and_line start_sal;
+ The routine searches for NAME among all members of the structure itself
+ and (recursively) among all members of any wrapper members
+ (e.g., '_parent').
- if (sym == NULL)
- return 0;
+ If NO_ERR, then simply return NULL in case of error, rather than
+ calling error. */
- start_sal = find_function_start_sal (sym, 0);
+struct value *
+ada_value_struct_elt (struct value *arg, char *name, int no_err)
+{
+ struct type *t, *t1;
+ struct value *v;
- return (start_sal.line != 0 && line_num >= start_sal.line);
-}
+ v = NULL;
+ t1 = t = ada_check_typedef (value_type (arg));
+ if (TYPE_CODE (t) == TYPE_CODE_REF)
+ {
+ t1 = TYPE_TARGET_TYPE (t);
+ if (t1 == NULL)
+ goto BadValue;
+ t1 = ada_check_typedef (t1);
+ if (TYPE_CODE (t1) == TYPE_CODE_PTR)
+ {
+ arg = coerce_ref (arg);
+ t = t1;
+ }
+ }
-/* Read in all symbol tables corresponding to partial symbol tables
- with file name FILENAME. */
+ while (TYPE_CODE (t) == TYPE_CODE_PTR)
+ {
+ t1 = TYPE_TARGET_TYPE (t);
+ if (t1 == NULL)
+ goto BadValue;
+ t1 = ada_check_typedef (t1);
+ if (TYPE_CODE (t1) == TYPE_CODE_PTR)
+ {
+ arg = value_ind (arg);
+ t = t1;
+ }
+ else
+ break;
+ }
-static void
-read_all_symtabs (const char *filename)
-{
- struct partial_symtab *ps;
- struct objfile *objfile;
+ if (TYPE_CODE (t1) != TYPE_CODE_STRUCT && TYPE_CODE (t1) != TYPE_CODE_UNION)
+ goto BadValue;
- ALL_PSYMTABS (objfile, ps)
- {
- QUIT;
+ if (t1 == t)
+ v = ada_search_struct_field (name, arg, 0, t);
+ else
+ {
+ int bit_offset, bit_size, byte_offset;
+ struct type *field_type;
+ CORE_ADDR address;
- if (strcmp (filename, ps->filename) == 0)
- PSYMTAB_TO_SYMTAB (ps);
- }
-}
+ if (TYPE_CODE (t) == TYPE_CODE_PTR)
+ address = value_as_address (arg);
+ else
+ address = unpack_pointer (t, value_contents (arg));
-/* All sals corresponding to line LINE_NUM in a symbol table from file
- FILENAME, as filtered by the user. Filter out any lines that
- reside in functions with "suppressed" names (not corresponding to
- explicit Ada functions), if there is at least one in a function
- with a non-suppressed name. If CANONICAL is not null, set
- it to a corresponding array of canonical line specs.
- If ONE_LOCATION_ONLY is set and several matches are found for
- the given location, then automatically select the first match found
- instead of asking the user which instance should be returned. */
+ t1 = ada_to_fixed_type (ada_get_base_type (t1), NULL, address, NULL);
+ if (find_struct_field (name, t1, 0,
+ &field_type, &byte_offset, &bit_offset,
+ &bit_size, NULL))
+ {
+ if (bit_size != 0)
+ {
+ if (TYPE_CODE (t) == TYPE_CODE_REF)
+ arg = ada_coerce_ref (arg);
+ else
+ arg = ada_value_ind (arg);
+ v = ada_value_primitive_packed_val (arg, NULL, byte_offset,
+ bit_offset, bit_size,
+ field_type);
+ }
+ else
+ v = value_from_pointer (lookup_reference_type (field_type),
+ address + byte_offset);
+ }
+ }
-struct symtabs_and_lines
-ada_sals_for_line (const char *filename, int line_num,
- int funfirstline, char ***canonical,
- int one_location_only)
-{
- struct symtabs_and_lines result;
- struct objfile *objfile;
- struct symtab *s;
- struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
- size_t len;
+ if (v != NULL || no_err)
+ return v;
+ else
+ error (_("There is no member named %s."), name);
- read_all_symtabs (filename);
+ BadValue:
+ if (no_err)
+ return NULL;
+ else
+ error (_("Attempt to extract a component of a value that is not a record."));
+}
- result.sals =
- (struct symtab_and_line *) xmalloc (4 * sizeof (result.sals[0]));
- result.nelts = 0;
- len = 4;
- make_cleanup (free_current_contents, &result.sals);
+/* Given a type TYPE, look up the type of the component of type named NAME.
+ If DISPP is non-null, add its byte displacement from the beginning of a
+ structure (pointed to by a value) of type TYPE to *DISPP (does not
+ work for packed fields).
- ALL_SYMTABS (objfile, s)
- {
- int ind, target_line_num;
+ Matches any field whose name has NAME as a prefix, possibly
+ followed by "___".
- QUIT;
+ TYPE can be either a struct or union. If REFOK, TYPE may also
+ be a (pointer or reference)+ to a struct or union, and the
+ ultimate target type will be searched.
+
+ Looks recursively into variant clauses and parent types.
- if (strcmp (s->filename, filename) != 0)
- continue;
+ If NOERR is nonzero, return NULL if NAME is not suitably defined or
+ TYPE is not a type of the right kind. */
+
+static struct type *
+ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
+ int noerr, int *dispp)
+{
+ int i;
- target_line_num =
- nearest_line_number_in_linetable (LINETABLE (s), line_num);
- if (target_line_num == -1)
- continue;
+ if (name == NULL)
+ goto BadName;
- ind = -1;
+ if (refok && type != NULL)
while (1)
{
- ind =
- find_next_line_in_linetable (LINETABLE (s),
- target_line_num, line_num, ind);
-
- if (ind < 0)
+ type = ada_check_typedef (type);
+ if (TYPE_CODE (type) != TYPE_CODE_PTR
+ && TYPE_CODE (type) != TYPE_CODE_REF)
break;
-
- GROW_VECT (result.sals, len, result.nelts + 1);
- init_sal (&result.sals[result.nelts]);
- result.sals[result.nelts].line = line_num;
- result.sals[result.nelts].pc = LINETABLE (s)->item[ind].pc;
- result.sals[result.nelts].symtab = s;
-
- if (funfirstline)
- adjust_pc_past_prologue (&result.sals[result.nelts].pc);
-
- result.nelts += 1;
+ type = TYPE_TARGET_TYPE (type);
}
- }
- if (canonical != NULL || result.nelts > 1)
+ if (type == NULL
+ || (TYPE_CODE (type) != TYPE_CODE_STRUCT
+ && TYPE_CODE (type) != TYPE_CODE_UNION))
{
- int k, j, n;
- char **func_names = (char **) alloca (result.nelts * sizeof (char *));
- int first_choice = (result.nelts > 1) ? 2 : 1;
- int *choices = (int *) alloca (result.nelts * sizeof (int));
-
- for (k = 0; k < result.nelts; k += 1)
+ if (noerr)
+ return NULL;
+ else
{
- 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.");
+ target_terminal_ours ();
+ gdb_flush (gdb_stdout);
+ if (type == NULL)
+ error (_("Type (null) is not a structure or union type"));
+ else
+ {
+ /* XXX: type_sprint */
+ fprintf_unfiltered (gdb_stderr, _("Type "));
+ type_print (type, "", gdb_stderr, -1);
+ error (_(" is not a structure or union type"));
+ }
}
+ }
- /* Remove suppressed names, unless all are suppressed. */
- for (j = 0; j < result.nelts; j += 1)
- if (!is_suppressed_name (func_names[j]))
- {
- /* At least one name is unsuppressed, so remove all
- suppressed names. */
- for (k = n = 0; k < result.nelts; k += 1)
- if (!is_suppressed_name (func_names[k]))
- {
- func_names[n] = func_names[k];
- result.sals[n] = result.sals[k];
- n += 1;
- }
- result.nelts = n;
- break;
- }
+ type = to_static_fixed_type (type);
+
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
+ {
+ char *t_field_name = TYPE_FIELD_NAME (type, i);
+ struct type *t;
+ int disp;
+
+ if (t_field_name == NULL)
+ continue;
- if (result.nelts > 1)
+ else if (field_name_match (t_field_name, name))
{
- if (one_location_only)
- {
- /* Automatically select the first of all possible choices. */
- n = 1;
- choices[0] = 0;
- }
- else
- {
- 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,
- ada_decode (func_names[k]));
-
- n = get_selections (choices, result.nelts, result.nelts,
- result.nelts > 1, "instance-choice");
- }
+ if (dispp != NULL)
+ *dispp += TYPE_FIELD_BITPOS (type, i) / 8;
+ return ada_check_typedef (TYPE_FIELD_TYPE (type, i));
+ }
- for (k = 0; k < n; k += 1)
+ else if (ada_is_wrapper_field (type, i))
+ {
+ disp = 0;
+ t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (type, i), name,
+ 0, 1, &disp);
+ if (t != NULL)
{
- result.sals[k] = result.sals[choices[k]];
- func_names[k] = func_names[choices[k]];
+ if (dispp != NULL)
+ *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
+ return t;
}
- result.nelts = n;
}
- if (canonical != NULL && result.nelts == 0)
- *canonical = NULL;
- else if (canonical != NULL)
+ else if (ada_is_variant_part (type, i))
{
- *canonical = (char **) xmalloc (result.nelts * sizeof (char **));
- make_cleanup (xfree, *canonical);
- for (k = 0; k < result.nelts; k += 1)
+ int j;
+ struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type, i));
+
+ for (j = TYPE_NFIELDS (field_type) - 1; j >= 0; j -= 1)
{
- (*canonical)[k] =
- extended_canonical_line_spec (result.sals[k], func_names[k]);
- if ((*canonical)[k] == NULL)
- error ("Could not locate one or more breakpoints.");
- make_cleanup (xfree, (*canonical)[k]);
+ disp = 0;
+ t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (field_type, j),
+ name, 0, 1, &disp);
+ if (t != NULL)
+ {
+ if (dispp != NULL)
+ *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
+ return t;
+ }
}
}
+
}
- if (result.nelts == 0)
+BadName:
+ if (!noerr)
{
- do_cleanups (old_chain);
- result.sals = NULL;
+ target_terminal_ours ();
+ gdb_flush (gdb_stdout);
+ if (name == NULL)
+ {
+ /* XXX: type_sprint */
+ fprintf_unfiltered (gdb_stderr, _("Type "));
+ type_print (type, "", gdb_stderr, -1);
+ error (_(" has no component named <null>"));
+ }
+ else
+ {
+ /* XXX: type_sprint */
+ fprintf_unfiltered (gdb_stderr, _("Type "));
+ type_print (type, "", gdb_stderr, -1);
+ error (_(" has no component named %s"), name);
+ }
}
- else
- discard_cleanups (old_chain);
- return result;
-}
+ return NULL;
+}
-/* A canonical line specification of the form FILE:NAME:LINENUM for
- symbol table and line data SAL. NULL if insufficient
- information. The caller is responsible for releasing any space
- allocated. */
+/* Assuming that VAR_TYPE is the type of a variant part of a record (a union),
+ within a value of type OUTER_TYPE that is stored in GDB at
+ OUTER_VALADDR, determine which variant clause (field number in VAR_TYPE,
+ numbering from 0) is applicable. Returns -1 if none are. */
-static char *
-extended_canonical_line_spec (struct symtab_and_line sal, const char *name)
+int
+ada_which_variant_applies (struct type *var_type, struct type *outer_type,
+ const gdb_byte *outer_valaddr)
{
- char *r;
+ int others_clause;
+ int i;
+ int disp;
+ struct type *discrim_type;
+ char *discrim_name = ada_variant_discrim_name (var_type);
+ LONGEST discrim_val;
- if (sal.symtab == NULL || sal.symtab->filename == NULL || sal.line <= 0)
- return NULL;
+ disp = 0;
+ discrim_type =
+ ada_lookup_struct_elt_type (outer_type, discrim_name, 1, 1, &disp);
+ if (discrim_type == NULL)
+ return -1;
+ discrim_val = unpack_long (discrim_type, outer_valaddr + disp);
- 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;
+ others_clause = -1;
+ for (i = 0; i < TYPE_NFIELDS (var_type); i += 1)
+ {
+ if (ada_is_others_clause (var_type, i))
+ others_clause = i;
+ else if (ada_in_variant (discrim_val, var_type, i))
+ return i;
+ }
+
+ return others_clause;
}
+\f
-/* Return type of Ada breakpoint associated with bp_stat:
- 0 if not an Ada-specific breakpoint, 1 for break on specific exception,
- 2 for break on unhandled exception, 3 for assert. */
-static int
-ada_exception_breakpoint_type (bpstat bs)
-{
- return ((! bs || ! bs->breakpoint_at) ? 0
- : bs->breakpoint_at->break_on_exception);
-}
+ /* Dynamic-Sized Records */
-/* True iff FRAME is very likely to be that of a function that is
- part of the runtime system. This is all very heuristic, but is
- intended to be used as advice as to what frames are uninteresting
- to most users. */
+/* Strategy: The type ostensibly attached to a value with dynamic size
+ (i.e., a size that is not statically recorded in the debugging
+ data) does not accurately reflect the size or layout of the value.
+ Our strategy is to convert these values to values with accurate,
+ conventional types that are constructed on the fly. */
-static int
-is_known_support_routine (struct frame_info *frame)
-{
- struct frame_info *next_frame = get_next_frame (frame);
- /* If frame is not innermost, that normally means that frame->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 frame->pc. */
- const int pc_is_after_call =
- next_frame != NULL
- && get_frame_type (next_frame) != SIGTRAMP_FRAME
- && get_frame_type (next_frame) != DUMMY_FRAME;
- struct symtab_and_line sal
- = find_pc_line (get_frame_pc (frame), pc_is_after_call);
- char *func_name;
- int i;
- struct stat st;
+/* There is a subtle and tricky problem here. In general, we cannot
+ determine the size of dynamic records without its data. However,
+ the 'struct value' data structure, which GDB uses to represent
+ quantities in the inferior process (the target), requires the size
+ of the type at the time of its allocation in order to reserve space
+ for GDB's internal copy of the data. That's why the
+ 'to_fixed_xxx_type' routines take (target) addresses as parameters,
+ rather than struct value*s.
+
+ However, GDB's internal history variables ($1, $2, etc.) are
+ struct value*s containing internal copies of the data that are not, in
+ general, the same as the data at their corresponding addresses in
+ the target. Fortunately, the types we give to these values are all
+ conventional, fixed-size types (as per the strategy described
+ above), so that we don't usually have to perform the
+ 'to_fixed_xxx_type' conversions to look at their values.
+ Unfortunately, there is one exception: if one of the internal
+ history variables is an array whose elements are unconstrained
+ records, then we will need to create distinct fixed types for each
+ element selected. */
- /* The heuristic:
- 1. The symtab is null (indicating no debugging symbols)
- 2. The symtab's filename does not exist.
- 3. The object file's name is one of the standard libraries.
- 4. The symtab's file name has the form of an Ada library source file.
- 5. The function at frame's PC has a GNAT-compiler-generated name. */
+/* The upshot of all of this is that many routines take a (type, host
+ address, target address) triple as arguments to represent a value.
+ The host address, if non-null, is supposed to contain an internal
+ copy of the relevant data; otherwise, the program is to consult the
+ target at the target address. */
- if (sal.symtab == NULL)
- return 1;
+/* Assuming that VAL0 represents a pointer value, the result of
+ dereferencing it. Differs from value_ind in its treatment of
+ dynamic-sized types. */
- /* On some systems (e.g. VxWorks), the kernel contains debugging
- symbols; in this case, the filename referenced by these symbols
- does not exists. */
+struct value *
+ada_value_ind (struct value *val0)
+{
+ struct value *val = unwrap_value (value_ind (val0));
+ return ada_to_fixed_value (val);
+}
- if (stat (sal.symtab->filename, &st))
- return 1;
+/* The value resulting from dereferencing any "reference to"
+ qualifiers on VAL0. */
- for (i = 0; known_runtime_file_name_patterns[i] != NULL; i += 1)
+static struct value *
+ada_coerce_ref (struct value *val0)
+{
+ if (TYPE_CODE (value_type (val0)) == TYPE_CODE_REF)
{
- re_comp (known_runtime_file_name_patterns[i]);
- if (re_exec (sal.symtab->filename))
- return 1;
+ struct value *val = val0;
+ val = coerce_ref (val);
+ val = unwrap_value (val);
+ return ada_to_fixed_value (val);
}
- if (sal.symtab->objfile != NULL)
- {
- for (i = 0; known_runtime_file_name_patterns[i] != NULL; i += 1)
- {
- re_comp (known_runtime_file_name_patterns[i]);
- if (re_exec (sal.symtab->objfile->name))
- return 1;
- }
- }
-
- /* If the frame PC points after the call instruction, then we need to
- decrement it in order to search for the function associated to this
- PC. Otherwise, if the associated call was the last instruction of
- the function, we might either find the wrong function or even fail
- during the function name lookup. */
- if (pc_is_after_call)
- func_name = function_name_from_pc (get_frame_pc (frame) - 1);
else
- func_name = function_name_from_pc (get_frame_pc (frame));
-
- if (func_name == NULL)
- return 1;
-
- for (i = 0; known_auxiliary_function_name_patterns[i] != NULL; i += 1)
- {
- re_comp (known_auxiliary_function_name_patterns[i]);
- if (re_exec (func_name))
- return 1;
- }
-
- return 0;
+ return val0;
}
-/* Find the first frame that contains debugging information and that is not
- part of the Ada run-time, starting from FI and moving upward. */
+/* Return OFF rounded upward if necessary to a multiple of
+ ALIGNMENT (a power of 2). */
-void
-ada_find_printable_frame (struct frame_info *fi)
+static unsigned int
+align_value (unsigned int off, unsigned int alignment)
{
- for (; fi != NULL; fi = get_prev_frame (fi))
- {
- if (!is_known_support_routine (fi))
- {
- select_frame (fi);
- break;
- }
- }
-
+ return (off + alignment - 1) & ~(alignment - 1);
}
-/* Name found for exception associated with last bpstat sent to
- ada_adjust_exception_stop. Set to the null string if that bpstat
- did not correspond to an Ada exception or no name could be found. */
-
-static char last_exception_name[256];
-
-/* If BS indicates a stop in an Ada exception, try to go up to a frame
- that will be meaningful to the user, and save the name of the last
- exception (truncated, if necessary) in last_exception_name. */
+/* Return the bit alignment required for field #F of template type TYPE. */
-void
-ada_adjust_exception_stop (bpstat bs)
+static unsigned int
+field_alignment (struct type *type, int f)
{
- CORE_ADDR addr;
- struct frame_info *fi;
- int frame_level;
- char *selected_frame_func;
+ const char *name = TYPE_FIELD_NAME (type, f);
+ int len = (name == NULL) ? 0 : strlen (name);
+ int align_offset;
- addr = 0;
- last_exception_name[0] = '\0';
- fi = get_selected_frame ();
- selected_frame_func = function_name_from_pc (get_frame_pc (fi));
+ if (!isdigit (name[len - 1]))
+ return 1;
- switch (ada_exception_breakpoint_type (bs))
- {
- default:
- return;
- case 1:
- break;
- case 2:
- /* Unhandled exceptions. Select the frame corresponding to
- ada.exceptions.process_raise_exception. This frame is at
- least 2 levels up, so we simply skip the first 2 frames
- without checking the name of their associated function. */
- for (frame_level = 0; frame_level < 2; frame_level += 1)
- if (fi != NULL)
- fi = get_prev_frame (fi);
- while (fi != NULL)
- {
- const char *func_name = function_name_from_pc (get_frame_pc (fi));
- if (func_name != NULL
- && strcmp (func_name, process_raise_exception_name) == 0)
- break; /* We found the frame we were looking for... */
- fi = get_prev_frame (fi);
- }
- if (fi == NULL)
- break;
- select_frame (fi);
- break;
- }
+ if (isdigit (name[len - 2]))
+ align_offset = len - 2;
+ else
+ align_offset = len - 1;
- addr = parse_and_eval_address ("e.full_name");
+ if (align_offset < 7 || strncmp ("___XV", name + align_offset - 6, 5) != 0)
+ return TARGET_CHAR_BIT;
- if (addr != 0)
- read_memory (addr, last_exception_name,
- sizeof (last_exception_name) - 1);
- last_exception_name[sizeof (last_exception_name) - 1] = '\0';
- ada_find_printable_frame (get_selected_frame ());
+ return atoi (name + align_offset) * TARGET_CHAR_BIT;
}
-/* Output Ada exception name (if any) associated with last call to
- ada_adjust_exception_stop. */
+/* Find a symbol named NAME. Ignores ambiguity. */
-void
-ada_print_exception_stop (bpstat bs)
+struct symbol *
+ada_find_any_symbol (const char *name)
{
- if (last_exception_name[0] != '\000')
- {
- ui_out_text (uiout, last_exception_name);
- ui_out_text (uiout, " at ");
- }
+ struct symbol *sym;
+
+ sym = standard_lookup (name, get_selected_block (NULL), VAR_DOMAIN);
+ if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+ return sym;
+
+ sym = standard_lookup (name, NULL, STRUCT_DOMAIN);
+ return sym;
}
-/* Parses the CONDITION string associated with a breakpoint exception
- to get the name of the exception on which the breakpoint has been
- set. The returned string needs to be deallocated after use. */
+/* Find a type named NAME. Ignores ambiguity. */
-static char *
-exception_name_from_cond (const char *condition)
+struct type *
+ada_find_any_type (const char *name)
{
- char *start, *end, *exception_name;
- int exception_name_len;
-
- start = strrchr (condition, '&') + 1;
- end = strchr (start, ')') - 1;
- exception_name_len = end - start + 1;
+ struct symbol *sym = ada_find_any_symbol (name);
- exception_name =
- (char *) xmalloc ((exception_name_len + 1) * sizeof (char));
- sprintf (exception_name, "%.*s", exception_name_len, start);
+ if (sym != NULL)
+ return SYMBOL_TYPE (sym);
- return exception_name;
+ return NULL;
}
-/* Print Ada-specific exception information about B, other than task
- clause. Return non-zero iff B was an Ada exception breakpoint. */
+/* Given a symbol NAME and its associated BLOCK, search all symbols
+ for its ___XR counterpart, which is the ``renaming'' symbol
+ associated to NAME. Return this symbol if found, return
+ NULL otherwise. */
-int
-ada_print_exception_breakpoint_nontask (struct breakpoint *b)
+struct symbol *
+ada_find_renaming_symbol (const char *name, struct block *block)
{
- if (b->break_on_exception == 1)
+ const struct symbol *function_sym = block_function (block);
+ char *rename;
+
+ if (function_sym != NULL)
{
- if (b->cond_string) /* the breakpoint is on a specific exception. */
- {
- char *exception_name = exception_name_from_cond (b->cond_string);
+ /* If the symbol is defined inside a function, NAME is not fully
+ qualified. This means we need to prepend the function name
+ as well as adding the ``___XR'' suffix to build the name of
+ the associated renaming symbol. */
+ char *function_name = SYMBOL_LINKAGE_NAME (function_sym);
+ /* Function names sometimes contain suffixes used
+ for instance to qualify nested subprograms. When building
+ the XR type name, we need to make sure that this suffix is
+ not included. So do not include any suffix in the function
+ name length below. */
+ const int function_name_len = ada_name_prefix_len (function_name);
+ const int rename_len = function_name_len + 2 /* "__" */
+ + strlen (name) + 6 /* "___XR\0" */ ;
+
+ /* Strip the suffix if necessary. */
+ function_name[function_name_len] = '\0';
- make_cleanup (xfree, exception_name);
+ /* Library-level functions are a special case, as GNAT adds
+ a ``_ada_'' prefix to the function name to avoid namespace
+ pollution. However, the renaming symbol themselves do not
+ have this prefix, so we need to skip this prefix if present. */
+ if (function_name_len > 5 /* "_ada_" */
+ && strstr (function_name, "_ada_") == function_name)
+ function_name = function_name + 5;
- ui_out_text (uiout, "on ");
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string (uiout, "exception", exception_name);
- else
- {
- ui_out_text (uiout, "exception ");
- ui_out_text (uiout, exception_name);
- ui_out_text (uiout, " ");
- }
- }
- else
- ui_out_text (uiout, "on all exceptions");
+ rename = (char *) alloca (rename_len * sizeof (char));
+ sprintf (rename, "%s__%s___XR", function_name, name);
}
- 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
- return 0;
- return 1;
-}
-
-/* Print task identifier for breakpoint B, if it is an Ada-specific
- breakpoint with non-zero tasking information. */
-
-void
-ada_print_exception_breakpoint_task (struct breakpoint *b)
-{
- if (b->task != 0)
{
- ui_out_text (uiout, " task ");
- ui_out_field_int (uiout, "task", b->task);
+ const int rename_len = strlen (name) + 6;
+ rename = (char *) alloca (rename_len * sizeof (char));
+ sprintf (rename, "%s___XR", name);
}
+
+ return ada_find_any_symbol (rename);
}
+/* Because of GNAT encoding conventions, several GDB symbols may match a
+ given type name. If the type denoted by TYPE0 is to be preferred to
+ that of TYPE1 for purposes of type printing, return non-zero;
+ otherwise return 0. */
+
int
-ada_is_exception_sym (struct symbol *sym)
+ada_prefer_type (struct type *type0, struct type *type1)
{
- 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 && strcmp (type_name, "exception") == 0);
+ if (type1 == NULL)
+ return 1;
+ else if (type0 == NULL)
+ return 0;
+ else if (TYPE_CODE (type1) == TYPE_CODE_VOID)
+ return 1;
+ else if (TYPE_CODE (type0) == TYPE_CODE_VOID)
+ return 0;
+ else if (TYPE_NAME (type1) == NULL && TYPE_NAME (type0) != NULL)
+ return 1;
+ else if (ada_is_packed_array_type (type0))
+ return 1;
+ else if (ada_is_array_descriptor_type (type0)
+ && !ada_is_array_descriptor_type (type1))
+ return 1;
+ else if (ada_renaming_type (type0) != NULL
+ && ada_renaming_type (type1) == NULL)
+ return 1;
+ return 0;
}
-int
-ada_maybe_exception_partial_symbol (struct partial_symbol *sym)
+/* 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)
{
- return (SYMBOL_CLASS (sym) != LOC_TYPEDEF
- && SYMBOL_CLASS (sym) != LOC_BLOCK
- && SYMBOL_CLASS (sym) != LOC_CONST);
+ if (type == NULL)
+ return NULL;
+ else if (TYPE_NAME (type) != NULL)
+ return TYPE_NAME (type);
+ else
+ return TYPE_TAG_NAME (type);
}
-/* Cause the appropriate error if no appropriate runtime symbol is
- found to set a breakpoint, using ERR_DESC to describe the
- breakpoint. */
+/* Find a parallel type to TYPE whose name is formed by appending
+ SUFFIX to the name of TYPE. */
-static void
-error_breakpoint_runtime_sym_not_found (const char *err_desc)
+struct type *
+ada_find_parallel_type (struct type *type, const char *suffix)
{
- /* If we are not debugging an Ada program, we can not put exception
- breakpoints! */
+ static char *name;
+ static size_t name_len = 0;
+ int len;
+ char *typename = ada_type_name (type);
- if (ada_update_initial_language (language_unknown, NULL) != language_ada)
- error ("Unable to break on %s. Is this an Ada main program?", err_desc);
+ if (typename == NULL)
+ return NULL;
- /* If the symbol does not exist, then check that the program is
- already started, to make sure that shared libraries have been
- loaded. If it is not started, this may mean that the symbol is
- in a shared library. */
+ len = strlen (typename);
- if (ptid_get_pid (inferior_ptid) == 0)
- error ("Unable to break on %s. Try to start the program first.", err_desc);
+ GROW_VECT (name, name_len, len + strlen (suffix) + 1);
- /* At this point, we know that we are debugging an Ada program and
- that the inferior has been started, but we still are not able to
- find the run-time symbols. That can mean that we are in
- configurable run time mode, or that a-except as been optimized
- out by the linker... In any case, at this point it is not worth
- supporting this feature. */
+ strcpy (name, typename);
+ strcpy (name + len, suffix);
- error ("Cannot break on %s in this configuration.", err_desc);
+ return ada_find_any_type (name);
}
-/* Test if NAME is currently defined, and that either ALLOW_TRAMP or
- the symbol is not a shared-library trampoline. Return the result of
- the test. */
-static int
-is_runtime_sym_defined (const char *name, int allow_tramp)
+/* 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)
{
- struct minimal_symbol *msym;
+ type = ada_check_typedef (type);
- msym = lookup_minimal_symbol (name, NULL, NULL);
- return (msym != NULL && msym->type != mst_unknown
- && (allow_tramp || msym->type != mst_solib_trampoline));
+ if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT
+ || ada_type_name (type) == NULL)
+ return NULL;
+ else
+ {
+ int len = strlen (ada_type_name (type));
+ if (len > 6 && strcmp (ada_type_name (type) + len - 6, "___XVE") == 0)
+ return type;
+ else
+ return ada_find_parallel_type (type, "___XVE");
+ }
}
-/* If ARG points to an Ada exception or assert breakpoint, rewrite
- 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. */
+/* Assuming that TEMPL_TYPE is a union or struct type, returns
+ non-zero iff field FIELD_NUM of TEMPL_TYPE has dynamic size. */
-char *
-ada_breakpoint_rewrite (char *arg, int *break_on_exceptionp)
+static int
+is_dynamic_field (struct type *templ_type, int field_num)
{
- if (arg == NULL)
- return arg;
- *break_on_exceptionp = 0;
- if (current_language->la_language == language_ada
- && strncmp (arg, "exception", 9) == 0
- && (arg[9] == ' ' || arg[9] == '\t' || arg[9] == '\0'))
- {
- char *tok, *end_tok;
- int toklen;
- int has_exception_propagation =
- is_runtime_sym_defined (raise_sym_name, 1);
-
- *break_on_exceptionp = 1;
-
- tok = arg + 9;
- while (*tok == ' ' || *tok == '\t')
- tok += 1;
-
- end_tok = tok;
+ const char *name = TYPE_FIELD_NAME (templ_type, field_num);
+ return name != NULL
+ && TYPE_CODE (TYPE_FIELD_TYPE (templ_type, field_num)) == TYPE_CODE_PTR
+ && strstr (name, "___XVL") != NULL;
+}
- while (*end_tok != ' ' && *end_tok != '\t' && *end_tok != '\000')
- end_tok += 1;
+/* The index of the variant field of TYPE, or -1 if TYPE does not
+ represent a variant record type. */
- toklen = end_tok - tok;
+static int
+variant_field_index (struct type *type)
+{
+ int f;
- arg = (char *) xmalloc (sizeof (longest_exception_template) + toklen);
- make_cleanup (xfree, arg);
- if (toklen == 0)
- {
- if (has_exception_propagation)
- sprintf (arg, "'%s'", raise_sym_name);
- else
- error_breakpoint_runtime_sym_not_found ("exception");
- }
- else if (strncmp (tok, "unhandled", toklen) == 0)
- {
- if (is_runtime_sym_defined (raise_unhandled_sym_name, 1))
- sprintf (arg, "'%s'", raise_unhandled_sym_name);
- else
- error_breakpoint_runtime_sym_not_found ("exception");
+ if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
+ return -1;
- *break_on_exceptionp = 2;
- }
- else
- {
- if (is_runtime_sym_defined (raise_sym_name, 0))
- sprintf (arg, "'%s' if long_integer(e) = long_integer(&%.*s)",
- raise_sym_name, toklen, tok);
- else
- error_breakpoint_runtime_sym_not_found ("specific exception");
- }
- }
- else if (current_language->la_language == language_ada
- && strncmp (arg, "assert", 6) == 0
- && (arg[6] == ' ' || arg[6] == '\t' || arg[6] == '\0'))
+ for (f = 0; f < TYPE_NFIELDS (type); f += 1)
{
- char *tok = arg + 6;
-
- if (!is_runtime_sym_defined (raise_assert_sym_name, 1))
- error_breakpoint_runtime_sym_not_found ("failed assertion");
-
- *break_on_exceptionp = 3;
-
- arg =
- (char *) xmalloc (sizeof (raise_assert_sym_name) + strlen (tok) + 2);
- make_cleanup (xfree, arg);
- sprintf (arg, "'%s'%s", raise_assert_sym_name, tok);
- }
- return arg;
-}
-#endif
-\f
- /* Field Access */
-
-/* True if field number FIELD_NUM in struct or union type TYPE is supposed
- to be invisible to users. */
-
-int
-ada_is_ignored_field (struct type *type, int field_num)
-{
- if (field_num < 0 || field_num > TYPE_NFIELDS (type))
- return 1;
- else
- {
- const char *name = TYPE_FIELD_NAME (type, field_num);
- return (name == NULL
- || (name[0] == '_' && strncmp (name, "_parent", 7) != 0));
+ if (ada_is_variant_part (type, f))
+ return f;
}
+ return -1;
}
-/* True iff TYPE has a tag field. If REFOK, then TYPE may also be a
- pointer or reference type whose ultimate target has a tag field. */
+/* A record type with no fields. */
-int
-ada_is_tagged_type (struct type *type, int refok)
+static struct type *
+empty_record (struct objfile *objfile)
{
- return (ada_lookup_struct_elt_type (type, "_tag", refok, 1, NULL) != NULL);
+ struct type *type = alloc_type (objfile);
+ TYPE_CODE (type) = TYPE_CODE_STRUCT;
+ TYPE_NFIELDS (type) = 0;
+ TYPE_FIELDS (type) = NULL;
+ TYPE_NAME (type) = "<empty>";
+ TYPE_TAG_NAME (type) = NULL;
+ TYPE_FLAGS (type) = 0;
+ TYPE_LENGTH (type) = 0;
+ return type;
}
-/* True iff TYPE represents the type of X'Tag */
+/* An ordinary record type (with fixed-length fields) that describes
+ the value of type TYPE at VALADDR or ADDRESS (see comments at
+ the beginning of this section) VAL according to GNAT conventions.
+ DVAL0 should describe the (portion of a) record that contains any
+ necessary discriminants. It should be NULL if value_type (VAL) is
+ an outer-level type (i.e., as opposed to a branch of a variant.) A
+ variant field (unless unchecked) is replaced by a particular branch
+ of the variant.
-int
-ada_is_tag_type (struct type *type)
-{
- if (type == NULL || TYPE_CODE (type) != TYPE_CODE_PTR)
- return 0;
- else {
- const char *name = ada_type_name (TYPE_TARGET_TYPE (type));
- return (name != NULL
- && strcmp (name, "ada__tags__dispatch_table") == 0);
- }
-}
+ If not KEEP_DYNAMIC_FIELDS, then all fields whose position or
+ length are not statically known are discarded. As a consequence,
+ VALADDR, ADDRESS and DVAL0 are ignored.
-/* The type of the tag on VAL. */
+ NOTE: Limitations: For now, we assume that dynamic fields and
+ variants occupy whole numbers of bytes. However, they need not be
+ byte-aligned. */
struct type *
-ada_tag_type (struct value *val)
+ada_template_to_fixed_record_type_1 (struct type *type,
+ const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval0,
+ int keep_dynamic_fields)
{
- return ada_lookup_struct_elt_type (VALUE_TYPE (val), "_tag", 1, 0, NULL);
-}
+ struct value *mark = value_mark ();
+ struct value *dval;
+ struct type *rtype;
+ int nfields, bit_len;
+ int variant_field;
+ long off;
+ int fld_bit_len, bit_incr;
+ int f;
-/* The value of the tag on VAL. */
+ /* Compute the number of fields in this record type that are going
+ to be processed: unless keep_dynamic_fields, this includes only
+ fields whose position and length are static will be processed. */
+ if (keep_dynamic_fields)
+ nfields = TYPE_NFIELDS (type);
+ else
+ {
+ nfields = 0;
+ while (nfields < TYPE_NFIELDS (type)
+ && !ada_is_variant_part (type, nfields)
+ && !is_dynamic_field (type, nfields))
+ nfields++;
+ }
-struct value *
-ada_value_tag (struct value *val)
-{
- return ada_value_struct_elt (val, "_tag", "record");
-}
+ rtype = alloc_type (TYPE_OBJFILE (type));
+ TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
+ INIT_CPLUS_SPECIFIC (rtype);
+ TYPE_NFIELDS (rtype) = nfields;
+ 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;
+ TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE;
-/* The value of the tag on the object of type TYPE whose contents are
- saved at VALADDR, if it is non-null, or is at memory address
- ADDRESS. */
+ off = 0;
+ bit_len = 0;
+ variant_field = -1;
-static struct value *
-value_tag_from_contents_and_address (struct type *type, char *valaddr,
- CORE_ADDR address)
-{
- int tag_byte_offset, dummy1, dummy2;
- struct type *tag_type;
- if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
- &dummy1, &dummy2))
+ for (f = 0; f < nfields; f += 1)
{
- char *valaddr1 = (valaddr == NULL) ? NULL : valaddr + tag_byte_offset;
- CORE_ADDR address1 = (address == 0) ? 0 : address + tag_byte_offset;
+ off = align_value (off, field_alignment (type, f))
+ + TYPE_FIELD_BITPOS (type, f);
+ TYPE_FIELD_BITPOS (rtype, f) = off;
+ TYPE_FIELD_BITSIZE (rtype, f) = 0;
- return value_from_contents_and_address (tag_type, valaddr1, address1);
+ if (ada_is_variant_part (type, f))
+ {
+ variant_field = f;
+ fld_bit_len = bit_incr = 0;
+ }
+ else if (is_dynamic_field (type, f))
+ {
+ if (dval0 == NULL)
+ 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_NAME (rtype, f) = TYPE_FIELD_NAME (type, f);
+ bit_incr = fld_bit_len =
+ TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, f)) * TARGET_CHAR_BIT;
+ }
+ else
+ {
+ 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 =
+ TYPE_FIELD_BITSIZE (rtype, f) = TYPE_FIELD_BITSIZE (type, f);
+ else
+ bit_incr = fld_bit_len =
+ TYPE_LENGTH (TYPE_FIELD_TYPE (type, f)) * TARGET_CHAR_BIT;
+ }
+ if (off + fld_bit_len > bit_len)
+ bit_len = off + fld_bit_len;
+ off += bit_incr;
+ TYPE_LENGTH (rtype) =
+ align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
}
- return NULL;
-}
-static struct type *
-type_from_tag (struct value *tag)
-{
- const char *type_name = ada_tag_name (tag);
- if (type_name != NULL)
- return ada_find_any_type (ada_encode (type_name));
- return NULL;
-}
+ /* We handle the variant part, if any, at the end because of certain
+ odd cases in which it is re-ordered so as NOT the last field of
+ the record. This can happen in the presence of representation
+ clauses. */
+ if (variant_field >= 0)
+ {
+ struct type *branch_type;
-struct tag_args {
- struct value *tag;
- char *name;
-};
+ off = TYPE_FIELD_BITPOS (rtype, variant_field);
-/* Wrapper function used by ada_tag_name. Given a struct tag_args*
- value ARGS, sets ARGS->name to the tag name of ARGS->tag.
- The value stored in ARGS->name is valid until the next call to
- ada_tag_name_1. */
+ if (dval0 == NULL)
+ dval = value_from_contents_and_address (rtype, valaddr, address);
+ else
+ dval = dval0;
-static int
-ada_tag_name_1 (void *args0)
-{
- struct tag_args *args = (struct tag_args *) args0;
- static char name[1024];
- char* p;
- struct value *val;
- args->name = NULL;
- val = ada_value_struct_elt (args->tag, "tsd", NULL);
- if (val == NULL)
- return 0;
- val = ada_value_struct_elt (val, "expanded_name", NULL);
- if (val == NULL)
- return 0;
- read_memory_string (value_as_address (val), name, sizeof (name) - 1);
- for (p = name; *p != '\0'; p += 1)
- if (isalpha (*p))
- *p = tolower (*p);
- args->name = name;
- return 0;
-}
+ branch_type =
+ to_fixed_variant_branch_type
+ (TYPE_FIELD_TYPE (type, variant_field),
+ cond_offset_host (valaddr, off / TARGET_CHAR_BIT),
+ cond_offset_target (address, off / TARGET_CHAR_BIT), dval);
+ if (branch_type == NULL)
+ {
+ for (f = variant_field + 1; f < TYPE_NFIELDS (rtype); f += 1)
+ TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
+ TYPE_NFIELDS (rtype) -= 1;
+ }
+ else
+ {
+ TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
+ TYPE_FIELD_NAME (rtype, variant_field) = "S";
+ fld_bit_len =
+ TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, variant_field)) *
+ TARGET_CHAR_BIT;
+ if (off + fld_bit_len > bit_len)
+ bit_len = off + fld_bit_len;
+ TYPE_LENGTH (rtype) =
+ align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
+ }
+ }
-/* The type name of the dynamic type denoted by the 'tag value TAG, as
- * a C string. */
+ /* According to exp_dbug.ads, the size of TYPE for variable-size records
+ should contain the alignment of that record, which should be a strictly
+ positive value. If null or negative, then something is wrong, most
+ probably in the debug info. In that case, we don't round up the size
+ of the resulting type. If this record is not part of another structure,
+ the current RTYPE length might be good enough for our purposes. */
+ if (TYPE_LENGTH (type) <= 0)
+ {
+ if (TYPE_NAME (rtype))
+ warning (_("Invalid type size for `%s' detected: %d."),
+ TYPE_NAME (rtype), TYPE_LENGTH (type));
+ else
+ warning (_("Invalid type size for <unnamed> detected: %d."),
+ TYPE_LENGTH (type));
+ }
+ else
+ {
+ TYPE_LENGTH (rtype) = align_value (TYPE_LENGTH (rtype),
+ TYPE_LENGTH (type));
+ }
-const char *
-ada_tag_name (struct value *tag)
-{
- struct tag_args args;
- if (! ada_is_tag_type (VALUE_TYPE (tag)))
- return NULL;
- args.tag = tag;
- args.name = NULL;
- catch_errors (ada_tag_name_1, &args, NULL, RETURN_MASK_ALL);
- return args.name;
+ value_free_to_mark (mark);
+ if (TYPE_LENGTH (rtype) > varsize_limit)
+ error (_("record type with dynamic size is larger than varsize-limit"));
+ return rtype;
}
-/* The parent type of TYPE, or NULL if none. */
+/* As for ada_template_to_fixed_record_type_1 with KEEP_DYNAMIC_FIELDS
+ of 1. */
-struct type *
-ada_parent_type (struct type *type)
+static struct type *
+template_to_fixed_record_type (struct type *type, const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval0)
{
- int i;
-
- CHECK_TYPEDEF (type);
-
- if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
- return NULL;
+ return ada_template_to_fixed_record_type_1 (type, valaddr,
+ address, dval0, 1);
+}
- for (i = 0; i < TYPE_NFIELDS (type); i += 1)
- if (ada_is_parent_field (type, i))
- return check_typedef (TYPE_FIELD_TYPE (type, i));
+/* An ordinary record type in which ___XVL-convention fields and
+ ___XVU- and ___XVN-convention field types in TYPE0 are replaced with
+ static approximations, containing all possible fields. Uses
+ no runtime values. Useless for use in values, but that's OK,
+ since the results are used only for type determinations. Works on both
+ structs and unions. Representation note: to save space, we memorize
+ the result of this function in the TYPE_TARGET_TYPE of the
+ template type. */
- return NULL;
-}
+static struct type *
+template_to_static_fixed_type (struct type *type0)
+{
+ struct type *type;
+ int nfields;
+ int f;
-/* True iff field number FIELD_NUM of structure type TYPE contains the
- parent-type (inherited) fields of a derived type. Assumes TYPE is
- a structure type with at least FIELD_NUM+1 fields. */
+ if (TYPE_TARGET_TYPE (type0) != NULL)
+ return TYPE_TARGET_TYPE (type0);
-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
- && (strncmp (name, "PARENT", 6) == 0
- || strncmp (name, "_parent", 7) == 0));
-}
+ nfields = TYPE_NFIELDS (type0);
+ type = type0;
-/* True iff field number FIELD_NUM of structure type TYPE is a
- transparent wrapper field (which should be silently traversed when doing
- field selection and flattened when printing). Assumes TYPE is a
- structure type with at least FIELD_NUM+1 fields. Such fields are always
- structures. */
+ for (f = 0; f < nfields; f += 1)
+ {
+ struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type0, f));
+ struct type *new_type;
-int
-ada_is_wrapper_field (struct type *type, int field_num)
-{
- const char *name = TYPE_FIELD_NAME (type, field_num);
- return (name != NULL
- && (strncmp (name, "PARENT", 6) == 0
- || strcmp (name, "REP") == 0
- || strncmp (name, "_parent", 7) == 0
- || name[0] == 'S' || name[0] == 'R' || name[0] == 'O'));
+ if (is_dynamic_field (type0, f))
+ new_type = to_static_fixed_type (TYPE_TARGET_TYPE (field_type));
+ else
+ new_type = to_static_fixed_type (field_type);
+ if (type == type0 && new_type != field_type)
+ {
+ TYPE_TARGET_TYPE (type0) = type = alloc_type (TYPE_OBJFILE (type0));
+ TYPE_CODE (type) = TYPE_CODE (type0);
+ INIT_CPLUS_SPECIFIC (type);
+ TYPE_NFIELDS (type) = nfields;
+ TYPE_FIELDS (type) = (struct field *)
+ TYPE_ALLOC (type, nfields * sizeof (struct field));
+ memcpy (TYPE_FIELDS (type), TYPE_FIELDS (type0),
+ sizeof (struct field) * nfields);
+ TYPE_NAME (type) = ada_type_name (type0);
+ TYPE_TAG_NAME (type) = NULL;
+ TYPE_FLAGS (type) |= TYPE_FLAG_FIXED_INSTANCE;
+ TYPE_LENGTH (type) = 0;
+ }
+ TYPE_FIELD_TYPE (type, f) = new_type;
+ TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (type0, f);
+ }
+ return type;
}
-/* 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. */
+/* Given an object of type TYPE whose contents are at VALADDR and
+ whose address in memory is ADDRESS, returns a revision of TYPE --
+ a non-dynamic-sized record with a variant part -- in which
+ the variant part is replaced with the appropriate branch. Looks
+ for discriminant values in DVAL0, which can be NULL if the record
+ contains the necessary discriminant values. */
-int
-ada_is_variant_part (struct type *type, int field_num)
+static struct type *
+to_record_with_fixed_variant_part (struct type *type, const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval0)
{
- 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));
-}
+ struct value *mark = value_mark ();
+ struct value *dval;
+ struct type *rtype;
+ struct type *branch_type;
+ int nfields = TYPE_NFIELDS (type);
+ int variant_field = variant_field_index (type);
-/* 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. */
+ if (variant_field == -1)
+ return 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, 1, NULL);
- if (type == NULL)
- return builtin_type_int;
+ if (dval0 == NULL)
+ dval = value_from_contents_and_address (type, valaddr, address);
else
- return type;
-}
+ dval = dval0;
-/* Assuming that TYPE is the type of a variant wrapper, and FIELD_NUM is a
- valid field number within it, returns 1 iff field FIELD_NUM of TYPE
- represents a 'when others' clause; otherwise 0. */
+ rtype = alloc_type (TYPE_OBJFILE (type));
+ TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
+ INIT_CPLUS_SPECIFIC (rtype);
+ TYPE_NFIELDS (rtype) = nfields;
+ 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;
+ TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE;
+ TYPE_LENGTH (rtype) = TYPE_LENGTH (type);
-int
-ada_is_others_clause (struct type *type, int field_num)
-{
- const char *name = TYPE_FIELD_NAME (type, field_num);
- return (name != NULL && name[0] == 'O');
+ branch_type = to_fixed_variant_branch_type
+ (TYPE_FIELD_TYPE (type, variant_field),
+ cond_offset_host (valaddr,
+ TYPE_FIELD_BITPOS (type, variant_field)
+ / TARGET_CHAR_BIT),
+ cond_offset_target (address,
+ TYPE_FIELD_BITPOS (type, variant_field)
+ / TARGET_CHAR_BIT), dval);
+ if (branch_type == NULL)
+ {
+ int f;
+ for (f = variant_field + 1; f < nfields; f += 1)
+ TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
+ TYPE_NFIELDS (rtype) -= 1;
+ }
+ else
+ {
+ TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
+ TYPE_FIELD_NAME (rtype, variant_field) = "S";
+ TYPE_FIELD_BITSIZE (rtype, variant_field) = 0;
+ TYPE_LENGTH (rtype) += TYPE_LENGTH (branch_type);
+ }
+ TYPE_LENGTH (rtype) -= TYPE_LENGTH (TYPE_FIELD_TYPE (type, variant_field));
+
+ value_free_to_mark (mark);
+ return rtype;
}
-/* Assuming that TYPE0 is the type of the variant part of a record,
- returns the name of the discriminant controlling the variant.
- The value is valid until the next call to ada_variant_discrim_name. */
+/* An ordinary record type (with fixed-length fields) that describes
+ the value at (TYPE0, VALADDR, ADDRESS) [see explanation at
+ beginning of this section]. Any necessary discriminants' values
+ should be in DVAL, a record value; it may be NULL if the object
+ at ADDR itself contains any necessary discriminant values.
+ Additionally, VALADDR and ADDRESS may also be NULL if no discriminant
+ values from the record are needed. Except in the case that DVAL,
+ VALADDR, and ADDRESS are all 0 or NULL, a variant field (unless
+ unchecked) is replaced by a particular branch of the variant.
-char *
-ada_variant_discrim_name (struct type *type0)
-{
- static char *result = NULL;
- static size_t result_len = 0;
- struct type *type;
- const char *name;
- const char *discrim_end;
- const char *discrim_start;
+ NOTE: the case in which DVAL and VALADDR are NULL and ADDRESS is 0
+ is questionable and may be removed. It can arise during the
+ processing of an unconstrained-array-of-record type where all the
+ variant branches have exactly the same size. This is because in
+ such cases, the compiler does not bother to use the XVS convention
+ when encoding the record. I am currently dubious of this
+ shortcut and suspect the compiler should be altered. FIXME. */
- if (TYPE_CODE (type0) == TYPE_CODE_PTR)
- type = TYPE_TARGET_TYPE (type0);
- else
- type = type0;
+static struct type *
+to_fixed_record_type (struct type *type0, const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval)
+{
+ struct type *templ_type;
- name = ada_type_name (type);
+ if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)
+ return type0;
- if (name == NULL || name[0] == '\000')
- return "";
+ templ_type = dynamic_template_type (type0);
- for (discrim_end = name + strlen (name) - 6; discrim_end != name;
- discrim_end -= 1)
+ if (templ_type != NULL)
+ return template_to_fixed_record_type (templ_type, valaddr, address, dval);
+ else if (variant_field_index (type0) >= 0)
{
- if (strncmp (discrim_end, "___XVN", 6) == 0)
- break;
+ if (dval == NULL && valaddr == NULL && address == 0)
+ return type0;
+ return to_record_with_fixed_variant_part (type0, valaddr, address,
+ dval);
}
- if (discrim_end == name)
- return "";
-
- for (discrim_start = discrim_end; discrim_start != name + 3;
- discrim_start -= 1)
+ else
{
- if (discrim_start == name + 1)
- return "";
- if ((discrim_start > name + 3
- && strncmp (discrim_start - 3, "___", 3) == 0)
- || discrim_start[-1] == '.')
- break;
+ TYPE_FLAGS (type0) |= TYPE_FLAG_FIXED_INSTANCE;
+ return type0;
}
- GROW_VECT (result, result_len, discrim_end - discrim_start + 1);
- strncpy (result, discrim_start, discrim_end - discrim_start);
- result[discrim_end - discrim_start] = '\0';
- return result;
}
-/* Scan STR for a subtype-encoded number, beginning at position K.
- Put the position of the character just past the number scanned in
- *NEW_K, if NEW_K!=NULL. Put the scanned number in *R, if R!=NULL.
- Return 1 if there was a valid number at the given position, and 0
- otherwise. A "subtype-encoded" number consists of the absolute value
- in decimal, followed by the letter 'm' to indicate a negative number.
- Assumes 0m does not occur. */
+/* An ordinary record type (with fixed-length fields) that describes
+ the value at (VAR_TYPE0, VALADDR, ADDRESS), where VAR_TYPE0 is a
+ union type. Any necessary discriminants' values should be in DVAL,
+ a record value. That is, this routine selects the appropriate
+ branch of the union at ADDR according to the discriminant value
+ indicated in the union's type name. */
-int
-ada_scan_number (const char str[], int k, LONGEST * R, int *new_k)
+static struct type *
+to_fixed_variant_branch_type (struct type *var_type0, const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval)
{
- ULONGEST RU;
+ int which;
+ struct type *templ_type;
+ struct type *var_type;
- if (!isdigit (str[k]))
- return 0;
+ if (TYPE_CODE (var_type0) == TYPE_CODE_PTR)
+ var_type = TYPE_TARGET_TYPE (var_type0);
+ else
+ var_type = var_type0;
- /* Do it the hard way so as not to make any assumption about
- the relationship of unsigned long (%lu scan format code) and
- LONGEST. */
- RU = 0;
- while (isdigit (str[k]))
- {
- RU = RU * 10 + (str[k] - '0');
- k += 1;
- }
+ templ_type = ada_find_parallel_type (var_type, "___XVU");
- if (str[k] == 'm')
- {
- if (R != NULL)
- *R = (-(LONGEST) (RU - 1)) - 1;
- k += 1;
- }
- else if (R != NULL)
- *R = (LONGEST) RU;
+ if (templ_type != NULL)
+ var_type = templ_type;
- /* NOTE on the above: Technically, C does not say what the results of
- - (LONGEST) RU or (LONGEST) -RU are for RU == largest positive
- number representable as a LONGEST (although either would probably work
- in most implementations). When RU>0, the locution in the then branch
- above is always equivalent to the negative of RU. */
+ which =
+ ada_which_variant_applies (var_type,
+ value_type (dval), value_contents (dval));
- if (new_k != NULL)
- *new_k = k;
- return 1;
+ 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);
+ else if (variant_field_index (TYPE_FIELD_TYPE (var_type, which)) >= 0)
+ return
+ to_fixed_record_type
+ (TYPE_FIELD_TYPE (var_type, which), valaddr, address, dval);
+ else
+ return TYPE_FIELD_TYPE (var_type, which);
}
-/* Assuming that TYPE is a variant part wrapper type (a VARIANTS field),
- 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. */
+/* Assuming that TYPE0 is an array type describing the type of a value
+ at ADDR, and that DVAL describes a record containing any
+ discriminants used in TYPE0, returns a type for the value that
+ contains no dynamic components (that is, no components whose sizes
+ are determined by run-time quantities). Unless IGNORE_TOO_BIG is
+ true, gives an error message if the resulting type's size is over
+ varsize_limit. */
-int
-ada_in_variant (LONGEST val, struct type *type, int field_num)
+static struct type *
+to_fixed_array_type (struct type *type0, struct value *dval,
+ int ignore_too_big)
{
- const char *name = TYPE_FIELD_NAME (type, field_num);
- int p;
+ struct type *index_type_desc;
+ struct type *result;
- p = 0;
- while (1)
+ 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)
{
- switch (name[p])
+ struct type *elt_type0 = ada_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. */
+ /* Create a fixed version of the array element type.
+ We're not providing the address of an element here,
+ and thus the actual object value cannot be inspected to do
+ the conversion. This should not be a problem, since arrays of
+ unconstrained objects are not allowed. In particular, all
+ the elements of an array of a tagged type should all be of
+ the same type specified in the debugging info. No need to
+ consult the object tag. */
+ 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)),
+ elt_type, TYPE_INDEX_TYPE (type0));
+ }
+ else
+ {
+ int i;
+ struct type *elt_type0;
+
+ elt_type0 = type0;
+ for (i = TYPE_NFIELDS (index_type_desc); i > 0; i -= 1)
+ elt_type0 = TYPE_TARGET_TYPE (elt_type0);
+
+ /* NOTE: result---the fixed version of elt_type0---should never
+ depend on the contents of the array in properly constructed
+ debugging data. */
+ /* Create a fixed version of the array element type.
+ We're not providing the address of an element here,
+ and thus the actual object value cannot be inspected to do
+ the conversion. This should not be a problem, since arrays of
+ unconstrained objects are not allowed. In particular, all
+ the elements of an array of a tagged type should all be of
+ the same type specified in the debugging info. No need to
+ consult the object tag. */
+ result = ada_to_fixed_type (ada_check_typedef (elt_type0), 0, 0, dval);
+ for (i = TYPE_NFIELDS (index_type_desc) - 1; i >= 0; i -= 1)
{
- case '\0':
- return 0;
- case 'S':
- {
- LONGEST W;
- if (!ada_scan_number (name, p + 1, &W, &p))
- return 0;
- if (val == W)
- return 1;
- break;
- }
- 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))
- return 0;
- if (val >= L && val <= U)
- return 1;
- break;
- }
- case 'O':
- return 1;
- default:
- return 0;
+ 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)
+ error (_("array type with dynamic size is larger than varsize-limit"));
}
+
+ TYPE_FLAGS (result) |= TYPE_FLAG_FIXED_INSTANCE;
+ return result;
}
-/* FIXME: Lots of redundancy below. Try to consolidate. */
-/* Given a value ARG1 (offset by OFFSET bytes) of a struct or union type
- ARG_TYPE, extract and return the value of one of its (non-static)
- fields. FIELDNO says which field. Differs from value_primitive_field
- only in that it can handle packed values of arbitrary type. */
+/* A standard type (containing no dynamically sized components)
+ corresponding to TYPE for the value (TYPE, VALADDR, ADDRESS)
+ DVAL describes a record containing any discriminants used in TYPE0,
+ and may be NULL if there are none, or if the object of type TYPE at
+ ADDRESS or in VALADDR contains these discriminants.
+
+ In the case of tagged types, this function attempts to locate the object's
+ tag and use it to compute the actual type. However, when ADDRESS is null,
+ we cannot use it to determine the location of the tag, and therefore
+ compute the tagged type's actual type. So we return the tagged type
+ without consulting the tag. */
+
+struct type *
+ada_to_fixed_type (struct type *type, const gdb_byte *valaddr,
+ CORE_ADDR address, struct value *dval)
+{
+ type = ada_check_typedef (type);
+ switch (TYPE_CODE (type))
+ {
+ default:
+ return type;
+ case TYPE_CODE_STRUCT:
+ {
+ struct type *static_type = to_static_fixed_type (type);
-static struct value *
-ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
- struct type *arg_type)
+ /* If STATIC_TYPE is a tagged type and we know the object's address,
+ then we can determine its tag, and compute the object's actual
+ type from there. */
+
+ if (address != 0 && ada_is_tagged_type (static_type, 0))
+ {
+ struct type *real_type =
+ type_from_tag (value_tag_from_contents_and_address (static_type,
+ valaddr,
+ address));
+ if (real_type != NULL)
+ type = real_type;
+ }
+ return to_fixed_record_type (type, valaddr, address, NULL);
+ }
+ case TYPE_CODE_ARRAY:
+ return to_fixed_array_type (type, dval, 1);
+ 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)
{
struct type *type;
- CHECK_TYPEDEF (arg_type);
- type = TYPE_FIELD_TYPE (arg_type, fieldno);
+ if (type0 == NULL)
+ return NULL;
- /* Handle packed fields. */
+ if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)
+ return type0;
- if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
- {
- int bit_pos = TYPE_FIELD_BITPOS (arg_type, fieldno);
- int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
+ type0 = ada_check_typedef (type0);
- return ada_value_primitive_packed_val (arg1, VALUE_CONTENTS (arg1),
- offset + bit_pos / 8,
- bit_pos % 8, bit_size, type);
+ switch (TYPE_CODE (type0))
+ {
+ default:
+ return type0;
+ case TYPE_CODE_STRUCT:
+ type = dynamic_template_type (type0);
+ if (type != NULL)
+ return template_to_static_fixed_type (type);
+ else
+ return template_to_static_fixed_type (type0);
+ case TYPE_CODE_UNION:
+ type = ada_find_parallel_type (type0, "___XVU");
+ if (type != NULL)
+ return template_to_static_fixed_type (type);
+ else
+ return template_to_static_fixed_type (type0);
}
- else
- return value_primitive_field (arg1, offset, fieldno, arg_type);
}
-/* Find field with name NAME in object of type TYPE. If found, return 1
- after setting *FIELD_TYPE_P to the field's type, *BYTE_OFFSET_P to
- OFFSET + the byte offset of the field within an object of that type,
- *BIT_OFFSET_P to the bit offset modulo byte size of the field, and
- *BIT_SIZE_P to its size in bits if the field is packed, and 0 otherwise.
- Looks inside wrappers for the field. Returns 0 if field not
- found. */
-static int
-find_struct_field (char *name, struct type *type, int offset,
- struct type **field_type_p,
- int *byte_offset_p, int *bit_offset_p, int *bit_size_p)
-{
- int i;
+/* A static approximation of TYPE with all type wrappers removed. */
- CHECK_TYPEDEF (type);
- *field_type_p = NULL;
- *byte_offset_p = *bit_offset_p = *bit_size_p = 0;
-
- for (i = TYPE_NFIELDS (type) - 1; i >= 0; i -= 1)
+static struct type *
+static_unwrap_type (struct type *type)
+{
+ if (ada_is_aligner_type (type))
{
- int bit_pos = TYPE_FIELD_BITPOS (type, i);
- int fld_offset = offset + bit_pos / 8;
- char *t_field_name = TYPE_FIELD_NAME (type, i);
-
- if (t_field_name == NULL)
- continue;
-
- else if (field_name_match (t_field_name, name))
- {
- int bit_size = TYPE_FIELD_BITSIZE (type, i);
- *field_type_p = TYPE_FIELD_TYPE (type, i);
- *byte_offset_p = fld_offset;
- *bit_offset_p = bit_pos % 8;
- *bit_size_p = bit_size;
- return 1;
- }
- else if (ada_is_wrapper_field (type, i))
- {
- if (find_struct_field (name, TYPE_FIELD_TYPE (type, i), fld_offset,
- field_type_p, byte_offset_p, bit_offset_p,
- bit_size_p))
- return 1;
- }
- else if (ada_is_variant_part (type, i))
- {
- int j;
- struct type *field_type = check_typedef (TYPE_FIELD_TYPE (type, i));
+ struct type *type1 = TYPE_FIELD_TYPE (ada_check_typedef (type), 0);
+ if (ada_type_name (type1) == NULL)
+ TYPE_NAME (type1) = ada_type_name (type);
- for (j = TYPE_NFIELDS (field_type) - 1; j >= 0; j -= 1)
- {
- if (find_struct_field (name, TYPE_FIELD_TYPE (field_type, j),
- fld_offset
- + TYPE_FIELD_BITPOS (field_type, j)/8,
- field_type_p, byte_offset_p, bit_offset_p,
- bit_size_p))
- return 1;
- }
- }
+ return static_unwrap_type (type1);
+ }
+ else
+ {
+ 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);
}
- return 0;
}
+/* In some cases, incomplete and private types require
+ cross-references that are not resolved as records (for example,
+ type Foo;
+ type FooP is access Foo;
+ V: FooP;
+ type Foo is array ...;
+ ). In these cases, since there is no mechanism for producing
+ cross-references to such types, we instead substitute for FooP a
+ stub enumeration type that is nowhere resolved, and whose tag is
+ the name of the actual type. Call these types "non-record stubs". */
+/* A type equivalent to TYPE that is not a non-record stub, if one
+ exists, otherwise TYPE. */
-/* Look for a field NAME in ARG. Adjust the address of ARG by OFFSET bytes,
- and search in it assuming it has (class) type TYPE.
- If found, return value, else return NULL.
+struct type *
+ada_check_typedef (struct type *type)
+{
+ CHECK_TYPEDEF (type);
+ if (type == NULL || TYPE_CODE (type) != TYPE_CODE_ENUM
+ || !TYPE_STUB (type)
+ || TYPE_TAG_NAME (type) == NULL)
+ return type;
+ else
+ {
+ char *name = TYPE_TAG_NAME (type);
+ struct type *type1 = ada_find_any_type (name);
+ return (type1 == NULL) ? type : type1;
+ }
+}
- Searches recursively through wrapper fields (e.g., '_parent'). */
+/* A value representing the data at VALADDR/ADDRESS as described by
+ 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]. */
static struct value *
-ada_search_struct_field (char *name, struct value *arg, int offset,
- struct type *type)
+ada_to_fixed_value_create (struct type *type0, CORE_ADDR address,
+ struct value *val0)
{
- int i;
- CHECK_TYPEDEF (type);
+ struct type *type = ada_to_fixed_type (type0, 0, address, NULL);
+ if (type == type0 && val0 != NULL)
+ return val0;
+ else
+ return value_from_contents_and_address (type, 0, address);
+}
- for (i = TYPE_NFIELDS (type) - 1; i >= 0; i -= 1)
- {
- char *t_field_name = TYPE_FIELD_NAME (type, i);
+/* A value representing VAL, but with a standard (static-sized) type
+ that correctly describes it. Does not necessarily create a new
+ value. */
- if (t_field_name == NULL)
- continue;
+static struct value *
+ada_to_fixed_value (struct value *val)
+{
+ return ada_to_fixed_value_create (value_type (val),
+ VALUE_ADDRESS (val) + value_offset (val),
+ val);
+}
- else if (field_name_match (t_field_name, name))
- return ada_value_primitive_field (arg, offset, i, type);
+/* A value representing VAL, but with a standard (static-sized) type
+ chosen to approximate the real type of VAL as well as possible, but
+ without consulting any runtime values. For Ada dynamic-sized
+ types, therefore, the type of the result is likely to be inaccurate. */
- 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));
- if (v != NULL)
- return v;
- }
+struct value *
+ada_to_static_fixed_value (struct value *val)
+{
+ 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, type);
+}
+\f
- else if (ada_is_variant_part (type, i))
- {
- int j;
- struct type *field_type = check_typedef (TYPE_FIELD_TYPE (type, i));
- int var_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
+/* Attributes */
- 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));
- if (v != NULL)
- return v;
- }
- }
- }
- return NULL;
-}
+/* Table mapping attribute numbers to names.
+ NOTE: Keep up to date with enum ada_attribute definition in ada-lang.h. */
-/* Given ARG, a value of type (pointer or reference 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. If ARG is a pointer or reference and the field
- is not packed, returns a reference to the field, otherwise the
- value of the field (an lvalue if ARG is an lvalue).
+static const char *attribute_names[] = {
+ "<?>",
- The routine searches for NAME among all members of the structure itself
- and (recursively) among all members of any wrapper members
- (e.g., '_parent').
+ "first",
+ "last",
+ "length",
+ "image",
+ "max",
+ "min",
+ "modulus",
+ "pos",
+ "size",
+ "tag",
+ "val",
+ 0
+};
+
+const char *
+ada_attribute_name (enum exp_opcode n)
+{
+ if (n >= OP_ATR_FIRST && n <= (int) OP_ATR_VAL)
+ return attribute_names[n - OP_ATR_FIRST + 1];
+ else
+ return attribute_names[0];
+}
- ERR is a name (for use in error messages) that identifies the class
- of entity that ARG is supposed to be. ERR may be null, indicating
- that on error, the function simply returns NULL, and does not
- throw an error. (FIXME: True only if ARG is a pointer or reference
- at the moment). */
+/* Evaluate the 'POS attribute applied to ARG. */
-struct value *
-ada_value_struct_elt (struct value *arg, char *name, char *err)
+static LONGEST
+pos_atr (struct value *arg)
{
- struct type *t, *t1;
- struct value *v;
+ struct type *type = value_type (arg);
- v = NULL;
- t1 = t = check_typedef (VALUE_TYPE (arg));
- if (TYPE_CODE (t) == TYPE_CODE_REF)
- {
- t1 = TYPE_TARGET_TYPE (t);
- if (t1 == NULL)
- {
- if (err == NULL)
- return NULL;
- else
- error ("Bad value type in a %s.", err);
- }
- CHECK_TYPEDEF (t1);
- if (TYPE_CODE (t1) == TYPE_CODE_PTR)
- {
- COERCE_REF (arg);
- t = t1;
- }
- }
+ if (!discrete_type_p (type))
+ error (_("'POS only defined on discrete types"));
- while (TYPE_CODE (t) == TYPE_CODE_PTR)
+ if (TYPE_CODE (type) == TYPE_CODE_ENUM)
{
- t1 = TYPE_TARGET_TYPE (t);
- if (t1 == NULL)
- {
- if (err == NULL)
- return NULL;
- else
- error ("Bad value type in a %s.", err);
- }
- CHECK_TYPEDEF (t1);
- if (TYPE_CODE (t1) == TYPE_CODE_PTR)
- {
- arg = value_ind (arg);
- t = t1;
- }
- else
- break;
+ int i;
+ LONGEST v = value_as_long (arg);
+
+ for (i = 0; i < TYPE_NFIELDS (type); i += 1)
+ {
+ if (v == TYPE_FIELD_BITPOS (type, i))
+ return i;
+ }
+ error (_("enumeration value is invalid: can't find 'POS"));
}
+ else
+ return value_as_long (arg);
+}
- if (TYPE_CODE (t1) != TYPE_CODE_STRUCT && TYPE_CODE (t1) != TYPE_CODE_UNION)
+static struct value *
+value_pos_atr (struct value *arg)
+{
+ return value_from_longest (builtin_type_int, pos_atr (arg));
+}
+
+/* Evaluate the TYPE'VAL attribute applied to ARG. */
+
+static struct value *
+value_val_atr (struct type *type, struct value *arg)
+{
+ if (!discrete_type_p (type))
+ error (_("'VAL only defined on discrete types"));
+ if (!integer_type_p (value_type (arg)))
+ error (_("'VAL requires integral argument"));
+
+ if (TYPE_CODE (type) == TYPE_CODE_ENUM)
{
- if (err == NULL)
- return NULL;
- else
- error ("Attempt to extract a component of a value that is not a %s.",
- err);
+ 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));
}
-
- if (t1 == t)
- v = ada_search_struct_field (name, arg, 0, t);
else
- {
- int bit_offset, bit_size, byte_offset;
- struct type *field_type;
- CORE_ADDR address;
+ return value_from_longest (type, value_as_long (arg));
+}
+\f
- if (TYPE_CODE (t) == TYPE_CODE_PTR)
- address = value_as_address (arg);
- else
- address = unpack_pointer (t, VALUE_CONTENTS (arg));
+ /* Evaluation */
- t1 = ada_to_fixed_type (ada_get_base_type (t1), NULL, address, NULL);
- if (find_struct_field (name, t1, 0,
- &field_type, &byte_offset, &bit_offset, &bit_size))
- {
- if (bit_size != 0)
- {
- arg = ada_value_ind (arg);
- v = ada_value_primitive_packed_val (arg, NULL, byte_offset,
- bit_offset, bit_size,
- field_type);
- }
- else
- v = value_from_pointer (lookup_reference_type (field_type),
- address + byte_offset);
- }
- }
-
- if (v == NULL && err != NULL)
- error ("There is no member named %s.", name);
+/* 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]. */
- return v;
+int
+ada_is_character_type (struct type *type)
+{
+ const char *name = ada_type_name (type);
+ return
+ name != NULL
+ && (TYPE_CODE (type) == TYPE_CODE_CHAR
+ || TYPE_CODE (type) == TYPE_CODE_INT
+ || TYPE_CODE (type) == TYPE_CODE_RANGE)
+ && (strcmp (name, "character") == 0
+ || strcmp (name, "wide_character") == 0
+ || strcmp (name, "unsigned char") == 0);
}
-/* Given a type TYPE, look up the type of the component of type named NAME.
- If DISPP is non-null, add its byte displacement from the beginning of a
- structure (pointed to by a value) of type TYPE to *DISPP (does not
- work for packed fields).
+/* True if TYPE appears to be an Ada string type. */
- Matches any field whose name has NAME as a prefix, possibly
- followed by "___".
+int
+ada_is_string_type (struct type *type)
+{
+ type = ada_check_typedef (type);
+ if (type != NULL
+ && TYPE_CODE (type) != TYPE_CODE_PTR
+ && (ada_is_simple_array_type (type)
+ || ada_is_array_descriptor_type (type))
+ && ada_array_arity (type) == 1)
+ {
+ struct type *elttype = ada_array_element_type (type, 1);
- TYPE can be either a struct or union. If REFOK, TYPE may also
- be a (pointer or reference)+ to a struct or union, and the
- ultimate target type will be searched.
+ return ada_is_character_type (elttype);
+ }
+ else
+ return 0;
+}
- Looks recursively into variant clauses and parent types.
- If NOERR is nonzero, return NULL if NAME is not suitably defined or
- TYPE is not a type of the right kind. */
+/* True if TYPE is a struct type introduced by the compiler to force the
+ alignment of a value. Such types have a single field with a
+ distinctive name. */
-static struct type *
-ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
- int noerr, int *dispp)
+int
+ada_is_aligner_type (struct type *type)
{
- int i;
+ type = ada_check_typedef (type);
- if (name == NULL)
- goto BadName;
+ /* If we can find a parallel XVS type, then the XVS type should
+ be used instead of this type. And hence, this is not an aligner
+ type. */
+ if (ada_find_parallel_type (type, "___XVS") != NULL)
+ return 0;
- if (refok && type != NULL)
- while (1)
- {
- CHECK_TYPEDEF (type);
- if (TYPE_CODE (type) != TYPE_CODE_PTR
- && TYPE_CODE (type) != TYPE_CODE_REF)
- break;
- type = TYPE_TARGET_TYPE (type);
- }
+ return (TYPE_CODE (type) == TYPE_CODE_STRUCT
+ && TYPE_NFIELDS (type) == 1
+ && strcmp (TYPE_FIELD_NAME (type, 0), "F") == 0);
+}
- if (type == NULL
- || (TYPE_CODE (type) != TYPE_CODE_STRUCT &&
- TYPE_CODE (type) != TYPE_CODE_UNION))
- {
- if (noerr)
- return NULL;
- else
- {
- target_terminal_ours ();
- gdb_flush (gdb_stdout);
- fprintf_unfiltered (gdb_stderr, "Type ");
- if (type == NULL)
- fprintf_unfiltered (gdb_stderr, "(null)");
- else
- type_print (type, "", gdb_stderr, -1);
- error (" is not a structure or union type");
- }
- }
-
- type = to_static_fixed_type (type);
+/* If there is an ___XVS-convention type parallel to SUBTYPE, return
+ the parallel type. */
- for (i = 0; i < TYPE_NFIELDS (type); i += 1)
- {
- char *t_field_name = TYPE_FIELD_NAME (type, i);
- struct type *t;
- int disp;
+struct type *
+ada_get_base_type (struct type *raw_type)
+{
+ struct type *real_type_namer;
+ struct type *raw_real_type;
- if (t_field_name == NULL)
- continue;
+ if (raw_type == NULL || TYPE_CODE (raw_type) != TYPE_CODE_STRUCT)
+ return raw_type;
- else if (field_name_match (t_field_name, name))
- {
- if (dispp != NULL)
- *dispp += TYPE_FIELD_BITPOS (type, i) / 8;
- return check_typedef (TYPE_FIELD_TYPE (type, i));
- }
+ real_type_namer = ada_find_parallel_type (raw_type, "___XVS");
+ if (real_type_namer == NULL
+ || TYPE_CODE (real_type_namer) != TYPE_CODE_STRUCT
+ || TYPE_NFIELDS (real_type_namer) != 1)
+ return raw_type;
- else if (ada_is_wrapper_field (type, i))
- {
- disp = 0;
- t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (type, i), name,
- 0, 1, &disp);
- if (t != NULL)
- {
- if (dispp != NULL)
- *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
- return t;
- }
- }
+ raw_real_type = ada_find_any_type (TYPE_FIELD_NAME (real_type_namer, 0));
+ if (raw_real_type == NULL)
+ return raw_type;
+ else
+ return raw_real_type;
+}
- else if (ada_is_variant_part (type, i))
- {
- int j;
- struct type *field_type = check_typedef (TYPE_FIELD_TYPE (type, i));
+/* The type of value designated by TYPE, with all aligners removed. */
- for (j = TYPE_NFIELDS (field_type) - 1; j >= 0; j -= 1)
- {
- disp = 0;
- t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (field_type, j),
- name, 0, 1, &disp);
- if (t != NULL)
- {
- if (dispp != NULL)
- *dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
- return t;
- }
- }
- }
+struct type *
+ada_aligned_type (struct type *type)
+{
+ if (ada_is_aligner_type (type))
+ return ada_aligned_type (TYPE_FIELD_TYPE (type, 0));
+ else
+ return ada_get_base_type (type);
+}
- }
-BadName:
- if (!noerr)
- {
- target_terminal_ours ();
- gdb_flush (gdb_stdout);
- fprintf_unfiltered (gdb_stderr, "Type ");
- type_print (type, "", gdb_stderr, -1);
- fprintf_unfiltered (gdb_stderr, " has no component named ");
- error ("%s", name == NULL ? "<null>" : name);
- }
+/* The address of the aligned value in an object at address VALADDR
+ having type TYPE. Assumes ada_is_aligner_type (TYPE). */
- return NULL;
+const gdb_byte *
+ada_aligned_value_addr (struct type *type, const gdb_byte *valaddr)
+{
+ 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);
+ else
+ return valaddr;
}
-/* Assuming that VAR_TYPE is the type of a variant part of a record (a union),
- within a value of type OUTER_TYPE that is stored in GDB at
- OUTER_VALADDR, determine which variant clause (field number in VAR_TYPE,
- numbering from 0) is applicable. Returns -1 if none are. */
-int
-ada_which_variant_applies (struct type *var_type, struct type *outer_type,
- char *outer_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)
{
- int others_clause;
- int i;
- int disp;
- struct type *discrim_type;
- char *discrim_name = ada_variant_discrim_name (var_type);
- LONGEST discrim_val;
+ static char *result;
+ static size_t result_len = 0;
+ char *tmp;
- disp = 0;
- discrim_type =
- ada_lookup_struct_elt_type (outer_type, discrim_name, 1, 1, &disp);
- if (discrim_type == NULL)
- return -1;
- discrim_val = unpack_long (discrim_type, outer_valaddr + disp);
+ /* First, unqualify the enumeration name:
+ 1. Search for the last '.' character. If we find one, then skip
+ all the preceeding characters, the unqualified name starts
+ right after that dot.
+ 2. Otherwise, we may be debugging on a target where the compiler
+ translates dots into "__". Search forward for double underscores,
+ but stop searching when we hit an overloading suffix, which is
+ of the form "__" followed by digits. */
- others_clause = -1;
- for (i = 0; i < TYPE_NFIELDS (var_type); i += 1)
+ tmp = strrchr (name, '.');
+ if (tmp != NULL)
+ name = tmp + 1;
+ else
{
- if (ada_is_others_clause (var_type, i))
- others_clause = i;
- else if (ada_in_variant (discrim_val, var_type, i))
- return i;
+ while ((tmp = strstr (name, "__")) != NULL)
+ {
+ if (isdigit (tmp[2]))
+ break;
+ else
+ name = tmp + 2;
+ }
}
- return others_clause;
-}
-\f
-
-
- /* Dynamic-Sized Records */
+ if (name[0] == 'Q')
+ {
+ int v;
+ if (name[1] == 'U' || name[1] == 'W')
+ {
+ if (sscanf (name + 2, "%x", &v) != 1)
+ return name;
+ }
+ else
+ return name;
-/* Strategy: The type ostensibly attached to a value with dynamic size
- (i.e., a size that is not statically recorded in the debugging
- data) does not accurately reflect the size or layout of the value.
- Our strategy is to convert these values to values with accurate,
- conventional types that are constructed on the fly. */
+ GROW_VECT (result, result_len, 16);
+ if (isascii (v) && isprint (v))
+ sprintf (result, "'%c'", v);
+ else if (name[1] == 'U')
+ sprintf (result, "[\"%02x\"]", v);
+ else
+ sprintf (result, "[\"%04x\"]", v);
-/* There is a subtle and tricky problem here. In general, we cannot
- determine the size of dynamic records without its data. However,
- the 'struct value' data structure, which GDB uses to represent
- quantities in the inferior process (the target), requires the size
- of the type at the time of its allocation in order to reserve space
- for GDB's internal copy of the data. That's why the
- 'to_fixed_xxx_type' routines take (target) addresses as parameters,
- rather than struct value*s.
+ return result;
+ }
+ else
+ {
+ tmp = strstr (name, "__");
+ if (tmp == NULL)
+ tmp = strstr (name, "$");
+ if (tmp != NULL)
+ {
+ GROW_VECT (result, result_len, tmp - name + 1);
+ strncpy (result, name, tmp - name);
+ result[tmp - name] = '\0';
+ return result;
+ }
- However, GDB's internal history variables ($1, $2, etc.) are
- struct value*s containing internal copies of the data that are not, in
- general, the same as the data at their corresponding addresses in
- the target. Fortunately, the types we give to these values are all
- conventional, fixed-size types (as per the strategy described
- above), so that we don't usually have to perform the
- 'to_fixed_xxx_type' conversions to look at their values.
- Unfortunately, there is one exception: if one of the internal
- history variables is an array whose elements are unconstrained
- records, then we will need to create distinct fixed types for each
- element selected. */
+ return name;
+ }
+}
-/* The upshot of all of this is that many routines take a (type, host
- address, target address) triple as arguments to represent a value.
- The host address, if non-null, is supposed to contain an internal
- copy of the relevant data; otherwise, the program is to consult the
- target at the target address. */
+static struct value *
+evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos,
+ enum noside noside)
+{
+ return (*exp->language_defn->la_exp_desc->evaluate_exp)
+ (expect_type, exp, pos, noside);
+}
-/* Assuming that VAL0 represents a pointer value, the result of
- dereferencing it. Differs from value_ind in its treatment of
- dynamic-sized types. */
+/* Evaluate the subexpression of EXP starting at *POS as for
+ evaluate_type, updating *POS to point just past the evaluated
+ expression. */
-struct value *
-ada_value_ind (struct value *val0)
+static struct value *
+evaluate_subexp_type (struct expression *exp, int *pos)
{
- struct value *val = unwrap_value (value_ind (val0));
- return ada_to_fixed_value (val);
+ return (*exp->language_defn->la_exp_desc->evaluate_exp)
+ (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
}
-/* The value resulting from dereferencing any "reference to"
- qualifiers on VAL0. */
+/* If VAL is wrapped in an aligner or subtype wrapper, return the
+ value it wraps. */
static struct value *
-ada_coerce_ref (struct value *val0)
+unwrap_value (struct value *val)
{
- if (TYPE_CODE (VALUE_TYPE (val0)) == TYPE_CODE_REF)
+ struct type *type = ada_check_typedef (value_type (val));
+ if (ada_is_aligner_type (type))
{
- struct value *val = val0;
- COERCE_REF (val);
- val = unwrap_value (val);
- return ada_to_fixed_value (val);
+ struct value *v = value_struct_elt (&val, NULL, "F",
+ NULL, "internal structure");
+ struct type *val_type = ada_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
- return val0;
-}
-
-/* Return OFF rounded upward if necessary to a multiple of
- ALIGNMENT (a power of 2). */
-
-static unsigned int
-align_value (unsigned int off, unsigned int alignment)
-{
- return (off + alignment - 1) & ~(alignment - 1);
-}
+ {
+ struct type *raw_real_type =
+ ada_check_typedef (ada_get_base_type (type));
-/* Return the bit alignment required for field #F of template type TYPE. */
+ if (type == raw_real_type)
+ return val;
-static unsigned int
-field_alignment (struct type *type, int f)
-{
- const char *name = TYPE_FIELD_NAME (type, f);
- int len = (name == NULL) ? 0 : strlen (name);
- int align_offset;
+ return
+ coerce_unspec_val_to_type
+ (val, ada_to_fixed_type (raw_real_type, 0,
+ VALUE_ADDRESS (val) + value_offset (val),
+ NULL));
+ }
+}
- if (!isdigit (name[len - 1]))
- return 1;
+static struct value *
+cast_to_fixed (struct type *type, struct value *arg)
+{
+ LONGEST val;
- if (isdigit (name[len - 2]))
- align_offset = len - 2;
+ if (type == value_type (arg))
+ return arg;
+ else if (ada_is_fixed_point_type (value_type (arg)))
+ val = ada_float_to_fixed (type,
+ ada_fixed_to_float (value_type (arg),
+ value_as_long (arg)));
else
- align_offset = len - 1;
-
- if (align_offset < 7 || strncmp ("___XV", name + align_offset - 6, 5) != 0)
- return TARGET_CHAR_BIT;
+ {
+ DOUBLEST argd =
+ value_as_double (value_cast (builtin_type_double, value_copy (arg)));
+ val = ada_float_to_fixed (type, argd);
+ }
- return atoi (name + align_offset) * TARGET_CHAR_BIT;
+ return value_from_longest (type, val);
}
-/* Find a symbol named NAME. Ignores ambiguity. */
-
-struct symbol *
-ada_find_any_symbol (const char *name)
+static struct value *
+cast_from_fixed_to_double (struct value *arg)
{
- struct symbol *sym;
-
- sym = standard_lookup (name, get_selected_block (NULL), VAR_DOMAIN);
- if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
- return sym;
-
- sym = standard_lookup (name, NULL, STRUCT_DOMAIN);
- return sym;
+ DOUBLEST val = ada_fixed_to_float (value_type (arg),
+ value_as_long (arg));
+ return value_from_double (builtin_type_double, val);
}
-/* Find a type named NAME. Ignores ambiguity. */
+/* Coerce VAL as necessary for assignment to an lval of type TYPE, and
+ return the converted value. */
-struct type *
-ada_find_any_type (const char *name)
+static struct value *
+coerce_for_assign (struct type *type, struct value *val)
{
- struct symbol *sym = ada_find_any_symbol (name);
+ struct type *type2 = value_type (val);
+ if (type == type2)
+ return val;
- if (sym != NULL)
- return SYMBOL_TYPE (sym);
+ type2 = ada_check_typedef (type2);
+ type = ada_check_typedef (type);
- return NULL;
-}
+ if (TYPE_CODE (type2) == TYPE_CODE_PTR
+ && TYPE_CODE (type) == TYPE_CODE_ARRAY)
+ {
+ val = ada_value_ind (val);
+ type2 = value_type (val);
+ }
-/* Given a symbol NAME and its associated BLOCK, search all symbols
- for its ___XR counterpart, which is the ``renaming'' symbol
- associated to NAME. Return this symbol if found, return
- NULL otherwise. */
+ 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)))
+ error (_("Incompatible types in assignment"));
+ deprecated_set_value_type (val, type);
+ }
+ return val;
+}
-struct symbol *
-ada_find_renaming_symbol (const char *name, struct block *block)
+static struct value *
+ada_value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
{
- const struct symbol *function_sym = block_function (block);
- char *rename;
+ struct value *val;
+ struct type *type1, *type2;
+ LONGEST v, v1, v2;
- if (function_sym != NULL)
- {
- /* If the symbol is defined inside a function, NAME is not fully
- qualified. This means we need to prepend the function name
- as well as adding the ``___XR'' suffix to build the name of
- the associated renaming symbol. */
- char *function_name = SYMBOL_LINKAGE_NAME (function_sym);
- const int function_name_len = strlen (function_name);
- const int rename_len = function_name_len
- + 2 /* "__" */
- + strlen (name)
- + 6 /* "___XR\0" */;
+ arg1 = coerce_ref (arg1);
+ arg2 = coerce_ref (arg2);
+ type1 = base_type (ada_check_typedef (value_type (arg1)));
+ type2 = base_type (ada_check_typedef (value_type (arg2)));
- /* Library-level functions are a special case, as GNAT adds
- a ``_ada_'' prefix to the function name to avoid namespace
- pollution. However, the renaming symbol themselves do not
- have this prefix, so we need to skip this prefix if present. */
- if (function_name_len > 5 /* "_ada_" */
- && strstr (function_name, "_ada_") == function_name)
- function_name = function_name + 5;
+ if (TYPE_CODE (type1) != TYPE_CODE_INT
+ || TYPE_CODE (type2) != TYPE_CODE_INT)
+ return value_binop (arg1, arg2, op);
- rename = (char *) alloca (rename_len * sizeof (char));
- sprintf (rename, "%s__%s___XR", function_name, name);
+ switch (op)
+ {
+ case BINOP_MOD:
+ case BINOP_DIV:
+ case BINOP_REM:
+ break;
+ default:
+ return value_binop (arg1, arg2, op);
}
- else
+
+ v2 = value_as_long (arg2);
+ if (v2 == 0)
+ error (_("second operand of %s must not be zero."), op_string (op));
+
+ if (TYPE_UNSIGNED (type1) || op == BINOP_MOD)
+ return value_binop (arg1, arg2, op);
+
+ v1 = value_as_long (arg1);
+ switch (op)
{
- const int rename_len = strlen (name) + 6;
- rename = (char *) alloca (rename_len * sizeof (char));
- sprintf (rename, "%s___XR", name);
+ case BINOP_DIV:
+ v = v1 / v2;
+ if (!TRUNCATION_TOWARDS_ZERO && v1 * (v1 % v2) < 0)
+ v += v > 0 ? -1 : 1;
+ break;
+ case BINOP_REM:
+ v = v1 % v2;
+ if (v * v1 < 0)
+ v -= v2;
+ break;
+ default:
+ /* Should not reach this point. */
+ v = 0;
}
- return ada_find_any_symbol (rename);
+ val = allocate_value (type1);
+ store_unsigned_integer (value_contents_raw (val),
+ TYPE_LENGTH (value_type (val)), v);
+ return val;
}
-/* Because of GNAT encoding conventions, several GDB symbols may match a
- given type name. If the type denoted by TYPE0 is to be preferred to
- that of TYPE1 for purposes of type printing, return non-zero;
- otherwise return 0. */
-
-int
-ada_prefer_type (struct type *type0, struct type *type1)
+static int
+ada_value_equal (struct value *arg1, struct value *arg2)
{
- if (type1 == NULL)
- return 1;
- else if (type0 == NULL)
- return 0;
- else if (TYPE_CODE (type1) == TYPE_CODE_VOID)
- return 1;
- else if (TYPE_CODE (type0) == TYPE_CODE_VOID)
- return 0;
- else if (TYPE_NAME (type1) == NULL && TYPE_NAME (type0) != NULL)
- return 1;
- else if (ada_is_packed_array_type (type0))
- return 1;
- else if (ada_is_array_descriptor_type (type0)
- && !ada_is_array_descriptor_type (type1))
- return 1;
- else if (ada_renaming_type (type0) != NULL
- && ada_renaming_type (type1) == NULL)
- return 1;
- return 0;
+ if (ada_is_direct_array_type (value_type (arg1))
+ || ada_is_direct_array_type (value_type (arg2)))
+ {
+ arg1 = ada_coerce_to_simple_array (arg1);
+ arg2 = ada_coerce_to_simple_array (arg2);
+ if (TYPE_CODE (value_type (arg1)) != TYPE_CODE_ARRAY
+ || TYPE_CODE (value_type (arg2)) != TYPE_CODE_ARRAY)
+ error (_("Attempt to compare array with non-array"));
+ /* FIXME: The following works only for types whose
+ representations use all bits (no padding or undefined bits)
+ and do not have user-defined equality. */
+ return
+ TYPE_LENGTH (value_type (arg1)) == TYPE_LENGTH (value_type (arg2))
+ && memcmp (value_contents (arg1), value_contents (arg2),
+ TYPE_LENGTH (value_type (arg1))) == 0;
+ }
+ return value_equal (arg1, arg2);
}
-/* The name of TYPE, which is either its TYPE_NAME, or, if that is
- null, its TYPE_TAG_NAME. Null if TYPE is null. */
+/* Total number of component associations in the aggregate starting at
+ index PC in EXP. Assumes that index PC is the start of an
+ OP_AGGREGATE. */
-char *
-ada_type_name (struct type *type)
+static int
+num_component_specs (struct expression *exp, int pc)
{
- if (type == NULL)
- return NULL;
- else if (TYPE_NAME (type) != NULL)
- return TYPE_NAME (type);
- else
- return TYPE_TAG_NAME (type);
+ int n, m, i;
+ m = exp->elts[pc + 1].longconst;
+ pc += 3;
+ n = 0;
+ for (i = 0; i < m; i += 1)
+ {
+ switch (exp->elts[pc].opcode)
+ {
+ default:
+ n += 1;
+ break;
+ case OP_CHOICES:
+ n += exp->elts[pc + 1].longconst;
+ break;
+ }
+ ada_evaluate_subexp (NULL, exp, &pc, EVAL_SKIP);
+ }
+ return n;
}
-/* Find a parallel type to TYPE whose name is formed by appending
- SUFFIX to the name of TYPE. */
+/* Assign the result of evaluating EXP starting at *POS to the INDEXth
+ component of LHS (a simple array or a record), updating *POS past
+ the expression, assuming that LHS is contained in CONTAINER. Does
+ not modify the inferior's memory, nor does it modify LHS (unless
+ LHS == CONTAINER). */
-struct type *
-ada_find_parallel_type (struct type *type, const char *suffix)
+static void
+assign_component (struct value *container, struct value *lhs, LONGEST index,
+ struct expression *exp, int *pos)
{
- static char *name;
- static size_t name_len = 0;
- int len;
- char *typename = ada_type_name (type);
+ struct value *mark = value_mark ();
+ struct value *elt;
+ if (TYPE_CODE (value_type (lhs)) == TYPE_CODE_ARRAY)
+ {
+ struct value *index_val = value_from_longest (builtin_type_int, index);
+ elt = unwrap_value (ada_value_subscript (lhs, 1, &index_val));
+ }
+ else
+ {
+ elt = ada_index_struct_field (index, lhs, 0, value_type (lhs));
+ elt = ada_to_fixed_value (unwrap_value (elt));
+ }
- if (typename == NULL)
- return NULL;
+ if (exp->elts[*pos].opcode == OP_AGGREGATE)
+ assign_aggregate (container, elt, exp, pos, EVAL_NORMAL);
+ else
+ value_assign_to_component (container, elt,
+ ada_evaluate_subexp (NULL, exp, pos,
+ EVAL_NORMAL));
- len = strlen (typename);
+ value_free_to_mark (mark);
+}
- GROW_VECT (name, name_len, len + strlen (suffix) + 1);
+/* Assuming that LHS represents an lvalue having a record or array
+ type, and EXP->ELTS[*POS] is an OP_AGGREGATE, evaluate an assignment
+ of that aggregate's value to LHS, advancing *POS past the
+ aggregate. NOSIDE is as for evaluate_subexp. CONTAINER is an
+ lvalue containing LHS (possibly LHS itself). Does not modify
+ the inferior's memory, nor does it modify the contents of
+ LHS (unless == CONTAINER). Returns the modified CONTAINER. */
- strcpy (name, typename);
- strcpy (name + len, suffix);
+static struct value *
+assign_aggregate (struct value *container,
+ struct value *lhs, struct expression *exp,
+ int *pos, enum noside noside)
+{
+ struct type *lhs_type;
+ int n = exp->elts[*pos+1].longconst;
+ LONGEST low_index, high_index;
+ int num_specs;
+ LONGEST *indices;
+ int max_indices, num_indices;
+ int is_array_aggregate;
+ int i;
+ struct value *mark = value_mark ();
- return ada_find_any_type (name);
-}
+ *pos += 3;
+ if (noside != EVAL_NORMAL)
+ {
+ int i;
+ for (i = 0; i < n; i += 1)
+ ada_evaluate_subexp (NULL, exp, pos, noside);
+ return container;
+ }
+ container = ada_coerce_ref (container);
+ if (ada_is_direct_array_type (value_type (container)))
+ container = ada_coerce_to_simple_array (container);
+ lhs = ada_coerce_ref (lhs);
+ if (!deprecated_value_modifiable (lhs))
+ error (_("Left operand of assignment is not a modifiable lvalue."));
-/* If TYPE is a variable-size record type, return the corresponding template
- type describing its fields. Otherwise, return NULL. */
+ lhs_type = value_type (lhs);
+ if (ada_is_direct_array_type (lhs_type))
+ {
+ lhs = ada_coerce_to_simple_array (lhs);
+ lhs_type = value_type (lhs);
+ low_index = TYPE_ARRAY_LOWER_BOUND_VALUE (lhs_type);
+ high_index = TYPE_ARRAY_UPPER_BOUND_VALUE (lhs_type);
+ is_array_aggregate = 1;
+ }
+ else if (TYPE_CODE (lhs_type) == TYPE_CODE_STRUCT)
+ {
+ low_index = 0;
+ high_index = num_visible_fields (lhs_type) - 1;
+ is_array_aggregate = 0;
+ }
+ else
+ error (_("Left-hand side must be array or record."));
-static struct type *
-dynamic_template_type (struct type *type)
-{
- CHECK_TYPEDEF (type);
+ num_specs = num_component_specs (exp, *pos - 3);
+ max_indices = 4 * num_specs + 4;
+ indices = alloca (max_indices * sizeof (indices[0]));
+ indices[0] = indices[1] = low_index - 1;
+ indices[2] = indices[3] = high_index + 1;
+ num_indices = 4;
- if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT
- || ada_type_name (type) == NULL)
- return NULL;
- else
+ for (i = 0; i < n; i += 1)
{
- int len = strlen (ada_type_name (type));
- if (len > 6 && strcmp (ada_type_name (type) + len - 6, "___XVE") == 0)
- return type;
- else
- return ada_find_parallel_type (type, "___XVE");
+ switch (exp->elts[*pos].opcode)
+ {
+ case OP_CHOICES:
+ aggregate_assign_from_choices (container, lhs, exp, pos, indices,
+ &num_indices, max_indices,
+ low_index, high_index);
+ break;
+ case OP_POSITIONAL:
+ aggregate_assign_positional (container, lhs, exp, pos, indices,
+ &num_indices, max_indices,
+ low_index, high_index);
+ break;
+ case OP_OTHERS:
+ if (i != n-1)
+ error (_("Misplaced 'others' clause"));
+ aggregate_assign_others (container, lhs, exp, pos, indices,
+ num_indices, low_index, high_index);
+ break;
+ default:
+ error (_("Internal error: bad aggregate clause"));
+ }
}
-}
-
-/* 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)
-{
- const char *name = TYPE_FIELD_NAME (templ_type, field_num);
- return name != NULL
- && TYPE_CODE (TYPE_FIELD_TYPE (templ_type, field_num)) == TYPE_CODE_PTR
- && strstr (name, "___XVL") != NULL;
+ return container;
}
-
-/* The index of the variant field of TYPE, or -1 if TYPE does not
- represent a variant record type. */
-
-static int
-variant_field_index (struct type *type)
+
+/* Assign into the component of LHS indexed by the OP_POSITIONAL
+ construct at *POS, updating *POS past the construct, given that
+ the positions are relative to lower bound LOW, where HIGH is the
+ upper bound. Record the position in INDICES[0 .. MAX_INDICES-1]
+ updating *NUM_INDICES as needed. CONTAINER is as for
+ assign_aggregate. */
+static void
+aggregate_assign_positional (struct value *container,
+ struct value *lhs, struct expression *exp,
+ int *pos, LONGEST *indices, int *num_indices,
+ int max_indices, LONGEST low, LONGEST high)
{
- int f;
-
- if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
- return -1;
-
- for (f = 0; f < TYPE_NFIELDS (type); f += 1)
+ LONGEST ind = longest_to_int (exp->elts[*pos + 1].longconst) + low;
+
+ if (ind - 1 == high)
+ warning (_("Extra components in aggregate ignored."));
+ if (ind <= high)
{
- if (ada_is_variant_part (type, f))
- return f;
+ add_component_interval (ind, ind, indices, num_indices, max_indices);
+ *pos += 3;
+ assign_component (container, lhs, ind, exp, pos);
}
- return -1;
+ else
+ ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
}
-/* A record type with no fields. */
-
-static struct type *
-empty_record (struct objfile *objfile)
+/* Assign into the components of LHS indexed by the OP_CHOICES
+ construct at *POS, updating *POS past the construct, given that
+ the allowable indices are LOW..HIGH. Record the indices assigned
+ to in INDICES[0 .. MAX_INDICES-1], updating *NUM_INDICES as
+ needed. CONTAINER is as for assign_aggregate. */
+static void
+aggregate_assign_from_choices (struct value *container,
+ struct value *lhs, struct expression *exp,
+ int *pos, LONGEST *indices, int *num_indices,
+ int max_indices, LONGEST low, LONGEST high)
{
- struct type *type = alloc_type (objfile);
- TYPE_CODE (type) = TYPE_CODE_STRUCT;
- TYPE_NFIELDS (type) = 0;
- TYPE_FIELDS (type) = NULL;
- TYPE_NAME (type) = "<empty>";
- TYPE_TAG_NAME (type) = NULL;
- TYPE_FLAGS (type) = 0;
- TYPE_LENGTH (type) = 0;
- return type;
-}
+ int j;
+ int n_choices = longest_to_int (exp->elts[*pos+1].longconst);
+ int choice_pos, expr_pc;
+ int is_array = ada_is_direct_array_type (value_type (lhs));
-/* An ordinary record type (with fixed-length fields) that describes
- the value of type TYPE at VALADDR or ADDRESS (see comments at
- the beginning of this section) VAL according to GNAT conventions.
- DVAL0 should describe the (portion of a) record that contains any
- necessary discriminants. It should be NULL if VALUE_TYPE (VAL) is
- an outer-level type (i.e., as opposed to a branch of a variant.) A
- variant field (unless unchecked) is replaced by a particular branch
- of the variant.
+ choice_pos = *pos += 3;
- If not KEEP_DYNAMIC_FIELDS, then all fields whose position or
- length are not statically known are discarded. As a consequence,
- VALADDR, ADDRESS and DVAL0 are ignored.
+ for (j = 0; j < n_choices; j += 1)
+ ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
+ expr_pc = *pos;
+ ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
+
+ for (j = 0; j < n_choices; j += 1)
+ {
+ LONGEST lower, upper;
+ enum exp_opcode op = exp->elts[choice_pos].opcode;
+ if (op == OP_DISCRETE_RANGE)
+ {
+ choice_pos += 1;
+ lower = value_as_long (ada_evaluate_subexp (NULL, exp, pos,
+ EVAL_NORMAL));
+ upper = value_as_long (ada_evaluate_subexp (NULL, exp, pos,
+ EVAL_NORMAL));
+ }
+ else if (is_array)
+ {
+ lower = value_as_long (ada_evaluate_subexp (NULL, exp, &choice_pos,
+ EVAL_NORMAL));
+ upper = lower;
+ }
+ else
+ {
+ int ind;
+ char *name;
+ switch (op)
+ {
+ case OP_NAME:
+ name = &exp->elts[choice_pos + 2].string;
+ break;
+ case OP_VAR_VALUE:
+ name = SYMBOL_NATURAL_NAME (exp->elts[choice_pos + 2].symbol);
+ break;
+ default:
+ error (_("Invalid record component association."));
+ }
+ ada_evaluate_subexp (NULL, exp, &choice_pos, EVAL_SKIP);
+ ind = 0;
+ if (! find_struct_field (name, value_type (lhs), 0,
+ NULL, NULL, NULL, NULL, &ind))
+ error (_("Unknown component name: %s."), name);
+ lower = upper = ind;
+ }
- NOTE: Limitations: For now, we assume that dynamic fields and
- variants occupy whole numbers of bytes. However, they need not be
- byte-aligned. */
+ if (lower <= upper && (lower < low || upper > high))
+ error (_("Index in component association out of bounds."));
-struct type *
-ada_template_to_fixed_record_type_1 (struct type *type, char *valaddr,
- CORE_ADDR address, struct value *dval0,
- int keep_dynamic_fields)
-{
- struct value *mark = value_mark ();
- struct value *dval;
- struct type *rtype;
- int nfields, bit_len;
- int variant_field;
- long off;
- int fld_bit_len, bit_incr;
- int f;
+ add_component_interval (lower, upper, indices, num_indices,
+ max_indices);
+ while (lower <= upper)
+ {
+ int pos1;
+ pos1 = expr_pc;
+ assign_component (container, lhs, lower, exp, &pos1);
+ lower += 1;
+ }
+ }
+}
- /* Compute the number of fields in this record type that are going
- to be processed: unless keep_dynamic_fields, this includes only
- fields whose position and length are static will be processed. */
- if (keep_dynamic_fields)
- nfields = TYPE_NFIELDS (type);
- else
+/* Assign the value of the expression in the OP_OTHERS construct in
+ EXP at *POS into the components of LHS indexed from LOW .. HIGH that
+ have not been previously assigned. The index intervals already assigned
+ are in INDICES[0 .. NUM_INDICES-1]. Updates *POS to after the
+ OP_OTHERS clause. CONTAINER is as for assign_aggregate*/
+static void
+aggregate_assign_others (struct value *container,
+ struct value *lhs, struct expression *exp,
+ int *pos, LONGEST *indices, int num_indices,
+ LONGEST low, LONGEST high)
+{
+ int i;
+ int expr_pc = *pos+1;
+
+ for (i = 0; i < num_indices - 2; i += 2)
{
- nfields = 0;
- while (nfields < TYPE_NFIELDS (type)
- && !ada_is_variant_part (type, nfields)
- && !is_dynamic_field (type, nfields))
- nfields++;
+ LONGEST ind;
+ for (ind = indices[i + 1] + 1; ind < indices[i + 2]; ind += 1)
+ {
+ int pos;
+ pos = expr_pc;
+ assign_component (container, lhs, ind, exp, &pos);
+ }
}
+ ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
+}
- rtype = alloc_type (TYPE_OBJFILE (type));
- TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
- INIT_CPLUS_SPECIFIC (rtype);
- TYPE_NFIELDS (rtype) = nfields;
- 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;
- TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE;
+/* Add the interval [LOW .. HIGH] to the sorted set of intervals
+ [ INDICES[0] .. INDICES[1] ],..., [ INDICES[*SIZE-2] .. INDICES[*SIZE-1] ],
+ modifying *SIZE as needed. It is an error if *SIZE exceeds
+ MAX_SIZE. The resulting intervals do not overlap. */
+static void
+add_component_interval (LONGEST low, LONGEST high,
+ LONGEST* indices, int *size, int max_size)
+{
+ int i, j;
+ for (i = 0; i < *size; i += 2) {
+ if (high >= indices[i] && low <= indices[i + 1])
+ {
+ int kh;
+ for (kh = i + 2; kh < *size; kh += 2)
+ if (high < indices[kh])
+ break;
+ if (low < indices[i])
+ indices[i] = low;
+ indices[i + 1] = indices[kh - 1];
+ if (high > indices[i + 1])
+ indices[i + 1] = high;
+ memcpy (indices + i + 2, indices + kh, *size - kh);
+ *size -= kh - i - 2;
+ return;
+ }
+ else if (high < indices[i])
+ break;
+ }
+
+ if (*size == max_size)
+ error (_("Internal error: miscounted aggregate components."));
+ *size += 2;
+ for (j = *size-1; j >= i+2; j -= 1)
+ indices[j] = indices[j - 2];
+ indices[i] = low;
+ indices[i + 1] = high;
+}
- off = 0;
- bit_len = 0;
- variant_field = -1;
+static struct value *
+ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
+ int *pos, enum noside noside)
+{
+ enum exp_opcode op;
+ int tem, tem2, tem3;
+ int pc;
+ struct value *arg1 = NULL, *arg2 = NULL, *arg3;
+ struct type *type;
+ int nargs, oplen;
+ struct value **argvec;
- for (f = 0; f < nfields; f += 1)
+ pc = *pos;
+ *pos += 1;
+ op = exp->elts[pc].opcode;
+
+ switch (op)
{
- off =
- align_value (off,
- field_alignment (type, f)) + TYPE_FIELD_BITPOS (type, f);
- TYPE_FIELD_BITPOS (rtype, f) = off;
- TYPE_FIELD_BITSIZE (rtype, f) = 0;
+ default:
+ *pos -= 1;
+ return
+ unwrap_value (evaluate_subexp_standard
+ (expect_type, exp, pos, noside));
- if (ada_is_variant_part (type, f))
- {
- variant_field = f;
- fld_bit_len = bit_incr = 0;
- }
- else if (is_dynamic_field (type, f))
- {
- if (dval0 == NULL)
- dval = value_from_contents_and_address (rtype, valaddr, address);
- else
- dval = dval0;
+ case OP_STRING:
+ {
+ struct value *result;
+ *pos -= 1;
+ result = evaluate_subexp_standard (expect_type, exp, pos, noside);
+ /* The result type will have code OP_STRING, bashed there from
+ OP_ARRAY. Bash it back. */
+ if (TYPE_CODE (value_type (result)) == TYPE_CODE_STRING)
+ TYPE_CODE (value_type (result)) = TYPE_CODE_ARRAY;
+ return result;
+ }
- 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;
- }
- else
+ case UNOP_CAST:
+ (*pos) += 2;
+ type = exp->elts[pc + 1].type;
+ arg1 = evaluate_subexp (type, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ if (type != ada_check_typedef (value_type (arg1)))
{
- 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 =
- TYPE_FIELD_BITSIZE (rtype, f) = TYPE_FIELD_BITSIZE (type, f);
+ if (ada_is_fixed_point_type (type))
+ 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)
+ {
+ /* 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)
+ return value_zero (to_static_fixed_type (type), not_lval);
+ arg1 =
+ ada_to_fixed_value_create
+ (type, VALUE_ADDRESS (arg1) + value_offset (arg1), 0);
+ }
else
- bit_incr = fld_bit_len =
- TYPE_LENGTH (TYPE_FIELD_TYPE (type, f)) * TARGET_CHAR_BIT;
+ arg1 = value_cast (type, arg1);
}
- if (off + fld_bit_len > bit_len)
- bit_len = off + fld_bit_len;
- off += bit_incr;
- TYPE_LENGTH (rtype) =
- align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
- }
-
- /* We handle the variant part, if any, at the end because of certain
- odd cases in which it is re-ordered so as NOT the last field of
- the record. This can happen in the presence of representation
- clauses. */
- if (variant_field >= 0)
- {
- struct type *branch_type;
+ return arg1;
- off = TYPE_FIELD_BITPOS (rtype, variant_field);
+ case UNOP_QUAL:
+ (*pos) += 2;
+ type = exp->elts[pc + 1].type;
+ return ada_evaluate_subexp (type, exp, pos, noside);
- if (dval0 == NULL)
- dval = value_from_contents_and_address (rtype, valaddr, address);
+ case BINOP_ASSIGN:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (exp->elts[*pos].opcode == OP_AGGREGATE)
+ {
+ arg1 = assign_aggregate (arg1, arg1, exp, pos, noside);
+ if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+ return arg1;
+ return ada_value_assign (arg1, arg1);
+ }
+ arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
+ if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+ return arg1;
+ 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
- dval = dval0;
+ arg2 = coerce_for_assign (value_type (arg1), arg2);
+ return ada_value_assign (arg1, arg2);
- branch_type =
- to_fixed_variant_branch_type
- (TYPE_FIELD_TYPE (type, variant_field),
- cond_offset_host (valaddr, off / TARGET_CHAR_BIT),
- cond_offset_target (address, off / TARGET_CHAR_BIT), dval);
- if (branch_type == NULL)
+ case BINOP_ADD:
+ arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
+ arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ 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"));
+ return value_cast (value_type (arg1), value_add (arg1, arg2));
+
+ case BINOP_SUB:
+ arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
+ arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ 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"));
+ return value_cast (value_type (arg1), value_sub (arg1, arg2));
+
+ case BINOP_MUL:
+ case BINOP_DIV:
+ 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
+ && (op == BINOP_DIV || op == BINOP_REM || op == BINOP_MOD))
+ return value_zero (value_type (arg1), not_lval);
+ else
{
- for (f = variant_field + 1; f < TYPE_NFIELDS (rtype); f += 1)
- TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
- TYPE_NFIELDS (rtype) -= 1;
- }
- else
- {
- TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
- TYPE_FIELD_NAME (rtype, variant_field) = "S";
- fld_bit_len =
- TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, variant_field)) *
- TARGET_CHAR_BIT;
- if (off + fld_bit_len > bit_len)
- bit_len = off + fld_bit_len;
- TYPE_LENGTH (rtype) =
- align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
+ if (ada_is_fixed_point_type (value_type (arg1)))
+ arg1 = cast_from_fixed_to_double (arg1);
+ if (ada_is_fixed_point_type (value_type (arg2)))
+ arg2 = cast_from_fixed_to_double (arg2);
+ return ada_value_binop (arg1, arg2, op);
}
- }
-
- TYPE_LENGTH (rtype) = align_value (TYPE_LENGTH (rtype), TYPE_LENGTH (type));
-
- value_free_to_mark (mark);
- if (TYPE_LENGTH (rtype) > varsize_limit)
- error ("record type with dynamic size is larger than varsize-limit");
- return rtype;
-}
-
-/* As for ada_template_to_fixed_record_type_1 with KEEP_DYNAMIC_FIELDS
- of 1. */
-
-static struct type *
-template_to_fixed_record_type (struct type *type, char *valaddr,
- CORE_ADDR address, struct value *dval0)
-{
- return ada_template_to_fixed_record_type_1 (type, valaddr,
- address, dval0, 1);
-}
-
-/* An ordinary record type in which ___XVL-convention fields and
- ___XVU- and ___XVN-convention field types in TYPE0 are replaced with
- static approximations, containing all possible fields. Uses
- no runtime values. Useless for use in values, but that's OK,
- since the results are used only for type determinations. Works on both
- structs and unions. Representation note: to save space, we memorize
- the result of this function in the TYPE_TARGET_TYPE of the
- template type. */
-
-static struct type *
-template_to_static_fixed_type (struct type *type0)
-{
- struct type *type;
- int nfields;
- int f;
- if (TYPE_TARGET_TYPE (type0) != NULL)
- return TYPE_TARGET_TYPE (type0);
+ case BINOP_REM:
+ case BINOP_MOD:
+ 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
+ && (op == BINOP_DIV || op == BINOP_REM || op == BINOP_MOD))
+ return value_zero (value_type (arg1), not_lval);
+ else
+ return ada_value_binop (arg1, arg2, op);
- nfields = TYPE_NFIELDS (type0);
- type = type0;
+ case BINOP_EQUAL:
+ case BINOP_NOTEQUAL:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ tem = 0;
+ else
+ tem = ada_value_equal (arg1, arg2);
+ if (op == BINOP_NOTEQUAL)
+ tem = !tem;
+ return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
- for (f = 0; f < nfields; f += 1)
- {
- struct type *field_type = CHECK_TYPEDEF (TYPE_FIELD_TYPE (type0, f));
- struct type *new_type;
+ case UNOP_NEG:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ else if (ada_is_fixed_point_type (value_type (arg1)))
+ return value_cast (value_type (arg1), value_neg (arg1));
+ else
+ return value_neg (arg1);
- if (is_dynamic_field (type0, f))
- new_type = to_static_fixed_type (TYPE_TARGET_TYPE (field_type));
+ case OP_VAR_VALUE:
+ *pos -= 1;
+ if (noside == EVAL_SKIP)
+ {
+ *pos += 4;
+ goto nosideret;
+ }
+ else if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN)
+ /* Only encountered when an unresolved symbol occurs in a
+ context other than a function call, in which case, it is
+ invalid. */
+ error (_("Unexpected unresolved symbol, %s, during evaluation"),
+ SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
+ 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))),
+ not_lval);
+ }
else
- new_type = to_static_fixed_type (field_type);
- if (type == type0 && new_type != field_type)
{
- TYPE_TARGET_TYPE (type0) = type = alloc_type (TYPE_OBJFILE (type0));
- TYPE_CODE (type) = TYPE_CODE (type0);
- INIT_CPLUS_SPECIFIC (type);
- TYPE_NFIELDS (type) = nfields;
- TYPE_FIELDS (type) = (struct field *)
- TYPE_ALLOC (type, nfields * sizeof (struct field));
- memcpy (TYPE_FIELDS (type), TYPE_FIELDS (type0),
- sizeof (struct field) * nfields);
- TYPE_NAME (type) = ada_type_name (type0);
- TYPE_TAG_NAME (type) = NULL;
- TYPE_FLAGS (type) |= TYPE_FLAG_FIXED_INSTANCE;
- TYPE_LENGTH (type) = 0;
+ arg1 =
+ unwrap_value (evaluate_subexp_standard
+ (expect_type, exp, pos, noside));
+ return ada_to_fixed_value (arg1);
}
- TYPE_FIELD_TYPE (type, f) = new_type;
- TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (type0, f);
- }
- return type;
-}
-
-/* Given an object of type TYPE whose contents are at VALADDR and
- whose address in memory is ADDRESS, returns a revision of TYPE --
- a non-dynamic-sized record with a variant part -- in which
- the variant part is replaced with the appropriate branch. Looks
- for discriminant values in DVAL0, which can be NULL if the record
- contains the necessary discriminant values. */
-
-static struct type *
-to_record_with_fixed_variant_part (struct type *type, char *valaddr,
- CORE_ADDR address, struct value *dval0)
-{
- struct value *mark = value_mark ();
- struct value *dval;
- struct type *rtype;
- struct type *branch_type;
- int nfields = TYPE_NFIELDS (type);
- int variant_field = variant_field_index (type);
-
- if (variant_field == -1)
- return type;
-
- if (dval0 == NULL)
- dval = value_from_contents_and_address (type, valaddr, address);
- else
- dval = dval0;
- rtype = alloc_type (TYPE_OBJFILE (type));
- TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
- INIT_CPLUS_SPECIFIC (rtype);
- TYPE_NFIELDS (rtype) = nfields;
- 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;
- TYPE_FLAGS (rtype) |= TYPE_FLAG_FIXED_INSTANCE;
- TYPE_LENGTH (rtype) = TYPE_LENGTH (type);
+ case OP_FUNCALL:
+ (*pos) += 2;
- branch_type = to_fixed_variant_branch_type
- (TYPE_FIELD_TYPE (type, variant_field),
- cond_offset_host (valaddr,
- TYPE_FIELD_BITPOS (type, variant_field)
- / TARGET_CHAR_BIT),
- cond_offset_target (address,
- TYPE_FIELD_BITPOS (type, variant_field)
- / TARGET_CHAR_BIT), dval);
- if (branch_type == NULL)
- {
- int f;
- for (f = variant_field + 1; f < nfields; f += 1)
- TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
- TYPE_NFIELDS (rtype) -= 1;
- }
- else
- {
- TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
- TYPE_FIELD_NAME (rtype, variant_field) = "S";
- TYPE_FIELD_BITSIZE (rtype, variant_field) = 0;
- TYPE_LENGTH (rtype) += TYPE_LENGTH (branch_type);
- }
- TYPE_LENGTH (rtype) -= TYPE_LENGTH (TYPE_FIELD_TYPE (type, variant_field));
+ /* Allocate arg vector, including space for the function to be
+ 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));
- value_free_to_mark (mark);
- return rtype;
-}
+ if (exp->elts[*pos].opcode == OP_VAR_VALUE
+ && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
+ error (_("Unexpected unresolved symbol, %s, during evaluation"),
+ SYMBOL_PRINT_NAME (exp->elts[pc + 5].symbol));
+ else
+ {
+ for (tem = 0; tem <= nargs; tem += 1)
+ argvec[tem] = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ argvec[tem] = 0;
-/* An ordinary record type (with fixed-length fields) that describes
- the value at (TYPE0, VALADDR, ADDRESS) [see explanation at
- beginning of this section]. Any necessary discriminants' values
- should be in DVAL, a record value; it may be NULL if the object
- at ADDR itself contains any necessary discriminant values.
- Additionally, VALADDR and ADDRESS may also be NULL if no discriminant
- values from the record are needed. Except in the case that DVAL,
- VALADDR, and ADDRESS are all 0 or NULL, a variant field (unless
- unchecked) is replaced by a particular branch of the variant.
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ }
- NOTE: the case in which DVAL and VALADDR are NULL and ADDRESS is 0
- is questionable and may be removed. It can arise during the
- processing of an unconstrained-array-of-record type where all the
- variant branches have exactly the same size. This is because in
- such cases, the compiler does not bother to use the XVS convention
- when encoding the record. I am currently dubious of this
- shortcut and suspect the compiler should be altered. FIXME. */
+ if (ada_is_packed_array_type (desc_base_type (value_type (argvec[0]))))
+ argvec[0] = ada_coerce_to_simple_array (argvec[0]);
+ else if (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_REF
+ || (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_ARRAY
+ && VALUE_LVAL (argvec[0]) == lval_memory))
+ argvec[0] = value_addr (argvec[0]);
-static struct type *
-to_fixed_record_type (struct type *type0, char *valaddr,
- CORE_ADDR address, struct value *dval)
-{
- struct type *templ_type;
+ type = ada_check_typedef (value_type (argvec[0]));
+ if (TYPE_CODE (type) == TYPE_CODE_PTR)
+ {
+ switch (TYPE_CODE (ada_check_typedef (TYPE_TARGET_TYPE (type))))
+ {
+ case TYPE_CODE_FUNC:
+ type = ada_check_typedef (TYPE_TARGET_TYPE (type));
+ break;
+ case TYPE_CODE_ARRAY:
+ break;
+ case TYPE_CODE_STRUCT:
+ if (noside != EVAL_AVOID_SIDE_EFFECTS)
+ argvec[0] = ada_value_ind (argvec[0]);
+ type = ada_check_typedef (TYPE_TARGET_TYPE (type));
+ break;
+ default:
+ error (_("cannot subscript or call something of type `%s'"),
+ ada_type_name (value_type (argvec[0])));
+ break;
+ }
+ }
- if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)
- return type0;
+ 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:
+ {
+ int arity;
- templ_type = dynamic_template_type (type0);
+ arity = ada_array_arity (type);
+ type = ada_array_element_type (type, nargs);
+ if (type == NULL)
+ error (_("cannot subscript or call a record"));
+ if (arity != nargs)
+ error (_("wrong number of subscripts; expecting %d"), arity);
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return allocate_value (ada_aligned_type (type));
+ 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
+ unwrap_value (ada_value_subscript
+ (ada_coerce_to_simple_array (argvec[0]),
+ 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));
- if (templ_type != NULL)
- return template_to_fixed_record_type (templ_type, valaddr, address, dval);
- else if (variant_field_index (type0) >= 0)
- {
- if (dval == NULL && valaddr == NULL && address == 0)
- return type0;
- return to_record_with_fixed_variant_part (type0, valaddr, address,
- dval);
- }
- else
- {
- TYPE_FLAGS (type0) |= TYPE_FLAG_FIXED_INSTANCE;
- return type0;
- }
+ default:
+ error (_("Attempt to index or call something other than an "
+ "array or function"));
+ }
-}
+ case TERNOP_SLICE:
+ {
+ struct value *array = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ struct value *low_bound_val =
+ evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ struct value *high_bound_val =
+ evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ LONGEST low_bound;
+ LONGEST high_bound;
+ low_bound_val = coerce_ref (low_bound_val);
+ high_bound_val = coerce_ref (high_bound_val);
+ low_bound = pos_atr (low_bound_val);
+ high_bound = pos_atr (high_bound_val);
-/* An ordinary record type (with fixed-length fields) that describes
- the value at (VAR_TYPE0, VALADDR, ADDRESS), where VAR_TYPE0 is a
- union type. Any necessary discriminants' values should be in DVAL,
- a record value. That is, this routine selects the appropriate
- branch of the union at ADDR according to the discriminant value
- indicated in the union's type name. */
+ if (noside == EVAL_SKIP)
+ goto nosideret;
-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;
+ /* If this is a reference to an aligner type, then remove all
+ the aligners. */
+ if (TYPE_CODE (value_type (array)) == TYPE_CODE_REF
+ && ada_is_aligner_type (TYPE_TARGET_TYPE (value_type (array))))
+ TYPE_TARGET_TYPE (value_type (array)) =
+ ada_aligned_type (TYPE_TARGET_TYPE (value_type (array)));
- if (TYPE_CODE (var_type0) == TYPE_CODE_PTR)
- var_type = TYPE_TARGET_TYPE (var_type0);
- else
- var_type = var_type0;
+ if (ada_is_packed_array_type (value_type (array)))
+ error (_("cannot slice a packed array"));
- templ_type = ada_find_parallel_type (var_type, "___XVU");
+ /* If this is a reference to an array or an array lvalue,
+ convert to a pointer. */
+ if (TYPE_CODE (value_type (array)) == TYPE_CODE_REF
+ || (TYPE_CODE (value_type (array)) == TYPE_CODE_ARRAY
+ && VALUE_LVAL (array) == lval_memory))
+ array = value_addr (array);
- if (templ_type != NULL)
- var_type = templ_type;
+ if (noside == EVAL_AVOID_SIDE_EFFECTS
+ && ada_is_array_descriptor_type (ada_check_typedef
+ (value_type (array))))
+ return empty_array (ada_type_of_array (array, 0), low_bound);
- which =
- ada_which_variant_applies (var_type,
- VALUE_TYPE (dval), VALUE_CONTENTS (dval));
+ array = ada_coerce_to_simple_array_ptr (array);
- 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);
- else if (variant_field_index (TYPE_FIELD_TYPE (var_type, which)) >= 0)
- return
- to_fixed_record_type
- (TYPE_FIELD_TYPE (var_type, which), valaddr, address, dval);
- else
- return TYPE_FIELD_TYPE (var_type, which);
-}
+ /* If we have more than one level of pointer indirection,
+ dereference the value until we get only one level. */
+ while (TYPE_CODE (value_type (array)) == TYPE_CODE_PTR
+ && (TYPE_CODE (TYPE_TARGET_TYPE (value_type (array)))
+ == TYPE_CODE_PTR))
+ array = value_ind (array);
+
+ /* Make sure we really do have an array type before going further,
+ to avoid a SEGV when trying to get the index type or the target
+ type later down the road if the debug info generated by
+ the compiler is incorrect or incomplete. */
+ if (!ada_is_simple_array_type (value_type (array)))
+ error (_("cannot take slice of non-array"));
+
+ if (TYPE_CODE (value_type (array)) == TYPE_CODE_PTR)
+ {
+ if (high_bound < low_bound || noside == EVAL_AVOID_SIDE_EFFECTS)
+ return empty_array (TYPE_TARGET_TYPE (value_type (array)),
+ low_bound);
+ else
+ {
+ struct type *arr_type0 =
+ to_fixed_array_type (TYPE_TARGET_TYPE (value_type (array)),
+ NULL, 1);
+ return ada_value_slice_ptr (array, arr_type0,
+ longest_to_int (low_bound),
+ longest_to_int (high_bound));
+ }
+ }
+ else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return array;
+ else if (high_bound < low_bound)
+ return empty_array (value_type (array), low_bound);
+ else
+ return ada_value_slice (array, longest_to_int (low_bound),
+ longest_to_int (high_bound));
+ }
-/* Assuming that TYPE0 is an array type describing the type of a value
- at ADDR, and that DVAL describes a record containing any
- discriminants used in TYPE0, returns a type for the value that
- contains no dynamic components (that is, no components whose sizes
- are determined by run-time quantities). Unless IGNORE_TOO_BIG is
- true, gives an error message if the resulting type's size is over
- varsize_limit. */
+ case UNOP_IN_RANGE:
+ (*pos) += 2;
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ type = exp->elts[pc + 1].type;
-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;
+ if (noside == EVAL_SKIP)
+ goto nosideret;
- if (ada_is_packed_array_type (type0) /* revisit? */
- || (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE))
- return type0;
+ switch (TYPE_CODE (type))
+ {
+ default:
+ lim_warning (_("Membership test incompletely implemented; "
+ "always returns true"));
+ return value_from_longest (builtin_type_int, (LONGEST) 1);
- index_type_desc = ada_find_parallel_type (type0, "___XA");
- if (index_type_desc == NULL)
- {
- 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);
+ case TYPE_CODE_RANGE:
+ arg2 = value_from_longest (builtin_type_int, TYPE_LOW_BOUND (type));
+ arg3 = value_from_longest (builtin_type_int,
+ 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)));
+ }
- if (elt_type0 == elt_type)
- result = type0;
- else
- result = create_array_type (alloc_type (TYPE_OBJFILE (type0)),
- elt_type, TYPE_INDEX_TYPE (type0));
- }
- else
- {
- int i;
- struct type *elt_type0;
+ case BINOP_IN_BOUNDS:
+ (*pos) += 2;
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- elt_type0 = type0;
- for (i = TYPE_NFIELDS (index_type_desc); i > 0; i -= 1)
- elt_type0 = TYPE_TARGET_TYPE (elt_type0);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
- /* 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);
- for (i = TYPE_NFIELDS (index_type_desc) - 1; i >= 0; i -= 1)
- {
- 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)
- error ("array type with dynamic size is larger than varsize-limit");
- }
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return value_zero (builtin_type_int, not_lval);
- TYPE_FLAGS (result) |= TYPE_FLAG_FIXED_INSTANCE;
- return result;
-}
+ tem = longest_to_int (exp->elts[pc + 1].longconst);
+ if (tem < 1 || tem > ada_array_arity (value_type (arg2)))
+ error (_("invalid dimension number to 'range"));
-/* A standard type (containing no dynamically sized components)
- corresponding to TYPE for the value (TYPE, VALADDR, ADDRESS)
- DVAL describes a record containing any discriminants used in TYPE0,
- and may be NULL if there are none, or if the object of type TYPE at
- ADDRESS or in VALADDR contains these discriminants. */
+ arg3 = ada_array_bound (arg2, tem, 1);
+ arg2 = ada_array_bound (arg2, tem, 0);
-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:
- {
- struct type *static_type = to_static_fixed_type (type);
- if (ada_is_tagged_type (static_type, 0))
- {
- struct type *real_type =
- type_from_tag (value_tag_from_contents_and_address (static_type,
- valaddr,
- address));
- if (real_type != NULL)
- type = real_type;
- }
- return to_fixed_record_type (type, valaddr, address, NULL);
- }
- case TYPE_CODE_ARRAY:
- return to_fixed_array_type (type, dval, 1);
- case TYPE_CODE_UNION:
- if (dval == NULL)
- return type;
- else
- return to_fixed_variant_branch_type (type, valaddr, address, dval);
- }
-}
+ return
+ value_from_longest (builtin_type_int,
+ (value_less (arg1, arg3)
+ || value_equal (arg1, arg3))
+ && (value_less (arg2, arg1)
+ || value_equal (arg2, arg1)));
-/* A standard (static-sized) type corresponding as well as possible to
- TYPE0, but based on no runtime data. */
+ case TERNOP_IN_RANGE:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ arg3 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
-static struct type *
-to_static_fixed_type (struct type *type0)
-{
- struct type *type;
+ if (noside == EVAL_SKIP)
+ goto nosideret;
- if (type0 == NULL)
- return NULL;
+ return
+ value_from_longest (builtin_type_int,
+ (value_less (arg1, arg3)
+ || value_equal (arg1, arg3))
+ && (value_less (arg2, arg1)
+ || value_equal (arg2, arg1)));
- if (TYPE_FLAGS (type0) & TYPE_FLAG_FIXED_INSTANCE)
- return type0;
+ case OP_ATR_FIRST:
+ case OP_ATR_LAST:
+ case OP_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 + 2].type;
+ }
+ else
+ {
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ type_arg = NULL;
+ }
- CHECK_TYPEDEF (type0);
+ if (exp->elts[*pos].opcode != OP_LONG)
+ error (_("Invalid operand to '%s"), ada_attribute_name (op));
+ tem = longest_to_int (exp->elts[*pos + 2].longconst);
+ *pos += 4;
- switch (TYPE_CODE (type0))
- {
- default:
- return type0;
- case TYPE_CODE_STRUCT:
- type = dynamic_template_type (type0);
- if (type != NULL)
- return template_to_static_fixed_type (type);
- else
- return template_to_static_fixed_type (type0);
- case TYPE_CODE_UNION:
- type = ada_find_parallel_type (type0, "___XVU");
- if (type != NULL)
- return template_to_static_fixed_type (type);
- else
- return template_to_static_fixed_type (type0);
- }
-}
+ if (noside == EVAL_SKIP)
+ goto nosideret;
-/* A static approximation of TYPE with all type wrappers removed. */
+ if (type_arg == NULL)
+ {
+ arg1 = ada_coerce_ref (arg1);
-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);
- if (ada_type_name (type1) == NULL)
- TYPE_NAME (type1) = ada_type_name (type);
+ if (ada_is_packed_array_type (value_type (arg1)))
+ arg1 = ada_coerce_to_simple_array (arg1);
- return static_unwrap_type (type1);
- }
- else
- {
- 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);
- }
-}
+ if (tem < 1 || tem > ada_array_arity (value_type (arg1)))
+ error (_("invalid dimension number to '%s"),
+ ada_attribute_name (op));
-/* In some cases, incomplete and private types require
- cross-references that are not resolved as records (for example,
- type Foo;
- type FooP is access Foo;
- V: FooP;
- type Foo is array ...;
- ). In these cases, since there is no mechanism for producing
- cross-references to such types, we instead substitute for FooP a
- stub enumeration type that is nowhere resolved, and whose tag is
- the name of the actual type. Call these types "non-record stubs". */
+ 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);
+ }
-/* A type equivalent to TYPE that is not a non-record stub, if one
- exists, otherwise TYPE. */
+ switch (op)
+ {
+ default: /* Should never happen. */
+ error (_("unexpected attribute encountered"));
+ case OP_ATR_FIRST:
+ return ada_array_bound (arg1, tem, 0);
+ case OP_ATR_LAST:
+ return ada_array_bound (arg1, tem, 1);
+ case OP_ATR_LENGTH:
+ return ada_array_length (arg1, tem);
+ }
+ }
+ else if (discrete_type_p (type_arg))
+ {
+ struct type *range_type;
+ char *name = ada_type_name (type_arg);
+ range_type = NULL;
+ if (name != NULL && TYPE_CODE (type_arg) != TYPE_CODE_ENUM)
+ range_type =
+ to_fixed_range_type (name, NULL, TYPE_OBJFILE (type_arg));
+ if (range_type == NULL)
+ range_type = type_arg;
+ switch (op)
+ {
+ default:
+ error (_("unexpected attribute encountered"));
+ case OP_ATR_FIRST:
+ return discrete_type_low_bound (range_type);
+ case OP_ATR_LAST:
+ return discrete_type_high_bound (range_type);
+ case OP_ATR_LENGTH:
+ error (_("the 'length attribute applies only to array types"));
+ }
+ }
+ else if (TYPE_CODE (type_arg) == TYPE_CODE_FLT)
+ error (_("unimplemented type attribute"));
+ else
+ {
+ LONGEST low, high;
-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
- {
- char *name = TYPE_TAG_NAME (type);
- struct type *type1 = ada_find_any_type (name);
- return (type1 == NULL) ? type : type1;
- }
-}
+ if (ada_is_packed_array_type (type_arg))
+ type_arg = decode_packed_array_type (type_arg);
-/* A value representing the data at VALADDR/ADDRESS as described by
- 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]. */
+ if (tem < 1 || tem > ada_array_arity (type_arg))
+ error (_("invalid dimension number to '%s"),
+ ada_attribute_name (op));
-static struct value *
-ada_to_fixed_value_create (struct type *type0, CORE_ADDR address,
- struct value *val0)
-{
- struct type *type = ada_to_fixed_type (type0, 0, address, NULL);
- if (type == type0 && val0 != NULL)
- return val0;
- else
- return value_from_contents_and_address (type, 0, address);
-}
+ type = ada_index_type (type_arg, tem);
+ if (type == NULL)
+ error
+ (_("attempt to take bound of something that is not an array"));
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return allocate_value (type);
-/* A value representing VAL, but with a standard (static-sized) type
- that correctly describes it. Does not necessarily create a new
- value. */
+ switch (op)
+ {
+ default:
+ error (_("unexpected attribute encountered"));
+ case OP_ATR_FIRST:
+ low = ada_array_bound_from_type (type_arg, tem, 0, &type);
+ return value_from_longest (type, low);
+ case OP_ATR_LAST:
+ high = ada_array_bound_from_type (type_arg, tem, 1, &type);
+ return value_from_longest (type, high);
+ case OP_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);
+ }
+ }
+ }
-static struct value *
-ada_to_fixed_value (struct value *val)
-{
- return ada_to_fixed_value_create (VALUE_TYPE (val),
- VALUE_ADDRESS (val) + VALUE_OFFSET (val),
- val);
-}
+ case OP_ATR_TAG:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
-/* If the PC is pointing inside a function prologue, then re-adjust it
- past this prologue. */
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return value_zero (ada_tag_type (arg1), not_lval);
-static void
-adjust_pc_past_prologue (CORE_ADDR *pc)
-{
- struct symbol *func_sym = find_pc_function (*pc);
+ return ada_value_tag (arg1);
+
+ case OP_ATR_MIN:
+ case OP_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,
+ op == OP_ATR_MIN ? BINOP_MIN : BINOP_MAX);
- if (func_sym)
- {
- const struct symtab_and_line sal = find_function_start_sal (func_sym, 1);
+ case OP_ATR_MODULUS:
+ {
+ struct type *type_arg = exp->elts[pc + 2].type;
+ evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
- if (*pc <= sal.pc)
- *pc = sal.pc;
- }
-}
+ if (noside == EVAL_SKIP)
+ goto nosideret;
-/* A value representing VAL, but with a standard (static-sized) type
- chosen to approximate the real type of VAL as well as possible, but
- without consulting any runtime values. For Ada dynamic-sized
- types, therefore, the type of the result is likely to be inaccurate. */
+ if (!ada_is_modular_type (type_arg))
+ error (_("'modulus must be applied to modular type"));
-struct value *
-ada_to_static_fixed_value (struct value *val)
-{
- 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, type);
-}
-\f
+ return value_from_longest (TYPE_TARGET_TYPE (type_arg),
+ ada_modulus (type_arg));
+ }
-/* Attributes */
-/* Table mapping attribute numbers to names.
- NOTE: Keep up to date with enum ada_attribute definition in ada-lang.h. */
+ case OP_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_int, not_lval);
+ else
+ return value_pos_atr (arg1);
-static const char *attribute_names[] = {
- "<?>",
+ case OP_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_int, not_lval);
+ else
+ return value_from_longest (builtin_type_int,
+ TARGET_CHAR_BIT
+ * TYPE_LENGTH (value_type (arg1)));
- "first",
- "last",
- "length",
- "image",
- "max",
- "min",
- "modulus",
- "pos",
- "size",
- "tag",
- "val",
- 0
-};
+ case OP_ATR_VAL:
+ evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ type = exp->elts[pc + 2].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);
-const char *
-ada_attribute_name (enum exp_opcode n)
-{
- if (n >= OP_ATR_FIRST && n <= (int) OP_ATR_VAL)
- return attribute_names[n - OP_ATR_FIRST + 1];
- else
- return attribute_names[0];
-}
+ case BINOP_EXP:
+ 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, op);
-/* Evaluate the 'POS attribute applied to ARG. */
+ case UNOP_PLUS:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ else
+ return arg1;
-static LONGEST
-pos_atr (struct value *arg)
-{
- struct type *type = VALUE_TYPE (arg);
+ case UNOP_ABS:
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ if (value_less (arg1, value_zero (value_type (arg1), not_lval)))
+ return value_neg (arg1);
+ else
+ return arg1;
- if (!discrete_type_p (type))
- error ("'POS only defined on discrete types");
+ case UNOP_IND:
+ if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR)
+ expect_type = TYPE_TARGET_TYPE (ada_check_typedef (expect_type));
+ arg1 = evaluate_subexp (expect_type, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ type = ada_check_typedef (value_type (arg1));
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ {
+ if (ada_is_array_descriptor_type (type))
+ /* GDB allows dereferencing GNAT array descriptors. */
+ {
+ 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);
+ }
+ 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)
+ {
+ type = to_static_fixed_type
+ (ada_aligned_type
+ (ada_check_typedef (TYPE_TARGET_TYPE (type))));
+ check_size (type);
+ return value_zero (type, lval_memory);
+ }
+ else if (TYPE_CODE (type) == TYPE_CODE_INT)
+ /* GDB allows dereferencing an int. */
+ return value_zero (builtin_type_int, lval_memory);
+ else
+ error (_("Attempt to take contents of a non-pointer value."));
+ }
+ arg1 = ada_coerce_ref (arg1); /* FIXME: What is this for?? */
+ type = ada_check_typedef (value_type (arg1));
- if (TYPE_CODE (type) == TYPE_CODE_ENUM)
- {
- int i;
- LONGEST v = value_as_long (arg);
+ if (ada_is_array_descriptor_type (type))
+ /* GDB allows dereferencing GNAT array descriptors. */
+ return ada_coerce_to_simple_array (arg1);
+ else
+ return ada_value_ind (arg1);
- for (i = 0; i < TYPE_NFIELDS (type); i += 1)
+ case STRUCTOP_STRUCT:
+ tem = longest_to_int (exp->elts[pc + 1].longconst);
+ (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
+ arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
- if (v == TYPE_FIELD_BITPOS (type, i))
- return i;
+ struct type *type1 = value_type (arg1);
+ if (ada_is_tagged_type (type1, 1))
+ {
+ type = ada_lookup_struct_elt_type (type1,
+ &exp->elts[pc + 2].string,
+ 1, 1, NULL);
+ if (type == NULL)
+ /* In this case, we assume that the field COULD exist
+ in some extension of the type. Return an object of
+ "type" void, which will match any formal
+ (see ada_type_match). */
+ return value_zero (builtin_type_void, lval_memory);
+ }
+ else
+ type =
+ ada_lookup_struct_elt_type (type1, &exp->elts[pc + 2].string, 1,
+ 0, NULL);
+
+ return value_zero (ada_aligned_type (type), lval_memory);
}
- error ("enumeration value is invalid: can't find 'POS");
+ else
+ return
+ ada_to_fixed_value (unwrap_value
+ (ada_value_struct_elt
+ (arg1, &exp->elts[pc + 2].string, 0)));
+ case OP_TYPE:
+ /* The value is not supposed to be used. This is here to make it
+ easier to accommodate expressions that contain types. */
+ (*pos) += 2;
+ if (noside == EVAL_SKIP)
+ goto nosideret;
+ else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return allocate_value (exp->elts[pc + 1].type);
+ else
+ error (_("Attempt to use a type name as an expression"));
+
+ case OP_AGGREGATE:
+ case OP_CHOICES:
+ case OP_OTHERS:
+ case OP_DISCRETE_RANGE:
+ case OP_POSITIONAL:
+ case OP_NAME:
+ if (noside == EVAL_NORMAL)
+ switch (op)
+ {
+ case OP_NAME:
+ error (_("Undefined name, ambiguous name, or renaming used in "
+ "component association: %s."), &exp->elts[pc+2].string);
+ case OP_AGGREGATE:
+ error (_("Aggregates only allowed on the right of an assignment"));
+ default:
+ internal_error (__FILE__, __LINE__, _("aggregate apparently mangled"));
+ }
+
+ ada_forward_operator_length (exp, pc, &oplen, &nargs);
+ *pos += oplen - 1;
+ for (tem = 0; tem < nargs; tem += 1)
+ ada_evaluate_subexp (NULL, exp, pos, noside);
+ goto nosideret;
}
- else
- return value_as_long (arg);
-}
-static struct value *
-value_pos_atr (struct value *arg)
-{
- return value_from_longest (builtin_type_ada_int, pos_atr (arg));
+nosideret:
+ return value_from_longest (builtin_type_long, (LONGEST) 1);
}
+\f
-/* Evaluate the TYPE'VAL attribute applied to ARG. */
+ /* Fixed point */
-static struct value *
-value_val_atr (struct type *type, struct value *arg)
+/* If TYPE encodes an Ada fixed-point type, return the suffix of the
+ type name that encodes the 'small and 'delta information.
+ Otherwise, return NULL. */
+
+static const char *
+fixed_type_info (struct type *type)
{
- if (!discrete_type_p (type))
- error ("'VAL only defined on discrete types");
- if (!integer_type_p (VALUE_TYPE (arg)))
- error ("'VAL requires integral argument");
+ const char *name = ada_type_name (type);
+ enum type_code code = (type == NULL) ? TYPE_CODE_UNDEF : TYPE_CODE (type);
- if (TYPE_CODE (type) == TYPE_CODE_ENUM)
+ if ((code == TYPE_CODE_INT || code == TYPE_CODE_RANGE) && name != NULL)
{
- 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));
+ const char *tail = strstr (name, "___XF_");
+ if (tail == NULL)
+ return NULL;
+ else
+ return tail + 5;
}
+ else if (code == TYPE_CODE_RANGE && TYPE_TARGET_TYPE (type) != type)
+ return fixed_type_info (TYPE_TARGET_TYPE (type));
else
- return value_from_longest (type, value_as_long (arg));
+ return NULL;
}
-\f
-
- /* 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]. */
+/* Returns non-zero iff TYPE represents an Ada fixed-point type. */
int
-ada_is_character_type (struct type *type)
+ada_is_fixed_point_type (struct type *type)
{
- const char *name = ada_type_name (type);
- return
- name != NULL
- && (TYPE_CODE (type) == TYPE_CODE_CHAR
- || TYPE_CODE (type) == TYPE_CODE_INT
- || TYPE_CODE (type) == TYPE_CODE_RANGE)
- && (strcmp (name, "character") == 0
- || strcmp (name, "wide_character") == 0
- || strcmp (name, "unsigned char") == 0);
+ return fixed_type_info (type) != NULL;
}
-/* True if TYPE appears to be an Ada string type. */
+/* Return non-zero iff TYPE represents a System.Address type. */
int
-ada_is_string_type (struct type *type)
+ada_is_system_address_type (struct type *type)
{
- CHECK_TYPEDEF (type);
- if (type != NULL
- && TYPE_CODE (type) != TYPE_CODE_PTR
- && (ada_is_simple_array_type (type) || ada_is_array_descriptor_type (type))
- && ada_array_arity (type) == 1)
- {
- struct type *elttype = ada_array_element_type (type, 1);
+ return (TYPE_NAME (type)
+ && strcmp (TYPE_NAME (type), "system__address") == 0);
+}
+
+/* Assuming that TYPE is the representation of an Ada fixed-point
+ type, return its delta, or -1 if the type is malformed and the
+ delta cannot be determined. */
+
+DOUBLEST
+ada_delta (struct type *type)
+{
+ const char *encoding = fixed_type_info (type);
+ long num, den;
+
+ if (sscanf (encoding, "_%ld_%ld", &num, &den) < 2)
+ return -1.0;
+ else
+ return (DOUBLEST) num / (DOUBLEST) den;
+}
+
+/* Assuming that ada_is_fixed_point_type (TYPE), return the scaling
+ factor ('SMALL value) associated with the type. */
+
+static DOUBLEST
+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);
- return ada_is_character_type (elttype);
- }
+ if (n < 2)
+ return 1.0;
+ else if (n == 4)
+ return (DOUBLEST) num1 / (DOUBLEST) den1;
else
- return 0;
+ return (DOUBLEST) num0 / (DOUBLEST) den0;
}
-/* True if TYPE is a struct type introduced by the compiler to force the
- alignment of a value. Such types have a single field with a
- distinctive name. */
+/* Assuming that X is the representation of a value of fixed-point
+ type TYPE, return its floating-point equivalent. */
-int
-ada_is_aligner_type (struct type *type)
+DOUBLEST
+ada_fixed_to_float (struct type *type, LONGEST x)
{
- CHECK_TYPEDEF (type);
- return (TYPE_CODE (type) == TYPE_CODE_STRUCT
- && TYPE_NFIELDS (type) == 1
- && strcmp (TYPE_FIELD_NAME (type, 0), "F") == 0);
+ return (DOUBLEST) x *scaling_factor (type);
}
-/* If there is an ___XVS-convention type parallel to SUBTYPE, return
- the parallel type. */
+/* The representation of a fixed-point value of type TYPE
+ corresponding to the value X. */
-struct type *
-ada_get_base_type (struct type *raw_type)
+LONGEST
+ada_float_to_fixed (struct type *type, DOUBLEST x)
{
- struct type *real_type_namer;
- struct type *raw_real_type;
+ return (LONGEST) (x / scaling_factor (type) + 0.5);
+}
- 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
- || TYPE_CODE (real_type_namer) != TYPE_CODE_STRUCT
- || TYPE_NFIELDS (real_type_namer) != 1)
- return raw_type;
+ /* VAX floating formats */
- raw_real_type = ada_find_any_type (TYPE_FIELD_NAME (real_type_namer, 0));
- if (raw_real_type == NULL)
- return raw_type;
- else
- return raw_real_type;
+/* Non-zero iff TYPE represents one of the special VAX floating-point
+ types. */
+
+int
+ada_is_vax_floating_type (struct type *type)
+{
+ int name_len =
+ (ada_type_name (type) == NULL) ? 0 : strlen (ada_type_name (type));
+ return
+ name_len > 6
+ && (TYPE_CODE (type) == TYPE_CODE_INT
+ || TYPE_CODE (type) == TYPE_CODE_RANGE)
+ && strncmp (ada_type_name (type) + name_len - 6, "___XF", 5) == 0;
}
-/* The type of value designated by TYPE, with all aligners removed. */
+/* The type of special VAX floating-point type this is, assuming
+ ada_is_vax_floating_point. */
-struct type *
-ada_aligned_type (struct type *type)
+int
+ada_vax_float_type_suffix (struct type *type)
{
- if (ada_is_aligner_type (type))
- return ada_aligned_type (TYPE_FIELD_TYPE (type, 0));
- else
- return ada_get_base_type (type);
+ 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). */
-/* The address of the aligned value in an object at address VALADDR
- having type TYPE. Assumes ada_is_aligner_type (TYPE). */
-
-char *
-ada_aligned_value_addr (struct type *type, char *valaddr)
+struct value *
+ada_vax_float_print_function (struct 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);
- else
- return valaddr;
+ 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"));
+ }
}
+\f
+ /* Range types */
+/* Scan STR beginning at position K for a discriminant name, and
+ return the value of that discriminant field of DVAL in *PX. If
+ PNEW_K is not null, put the position of the character beyond the
+ name scanned in *PNEW_K. Return 1 if successful; return 0 and do
+ not alter *PX and *PNEW_K if unsuccessful. */
-/* 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)
+static int
+scan_discrim_bound (char *str, int k, struct value *dval, LONGEST * px,
+ int *pnew_k)
{
- static char *result;
- static size_t result_len = 0;
- char *tmp;
-
- /* First, unqualify the enumeration name:
- 1. Search for the last '.' character. If we find one, then skip
- all the preceeding characters, the unqualified name starts
- right after that dot.
- 2. Otherwise, we may be debugging on a target where the compiler
- translates dots into "__". Search forward for double underscores,
- but stop searching when we hit an overloading suffix, which is
- of the form "__" followed by digits. */
+ static char *bound_buffer = NULL;
+ static size_t bound_buffer_len = 0;
+ char *bound;
+ char *pend;
+ struct value *bound_val;
- if ((tmp = strrchr (name, '.')) != NULL)
- name = tmp + 1;
- else
- {
- while ((tmp = strstr (name, "__")) != NULL)
- {
- if (isdigit (tmp[2]))
- break;
- else
- name = tmp + 2;
- }
- }
+ if (dval == NULL || str == NULL || str[k] == '\0')
+ return 0;
- if (name[0] == 'Q')
+ pend = strstr (str + k, "__");
+ if (pend == NULL)
{
- int v;
- if (name[1] == 'U' || name[1] == 'W')
- {
- if (sscanf (name + 2, "%x", &v) != 1)
- return name;
- }
- else
- return name;
-
- GROW_VECT (result, result_len, 16);
- if (isascii (v) && isprint (v))
- sprintf (result, "'%c'", v);
- else if (name[1] == 'U')
- sprintf (result, "[\"%02x\"]", v);
- else
- sprintf (result, "[\"%04x\"]", v);
-
- return result;
+ bound = str + k;
+ k += strlen (bound);
}
else
{
- if ((tmp = strstr (name, "__")) != NULL
- || (tmp = strstr (name, "$")) != NULL)
- {
- GROW_VECT (result, result_len, tmp - name + 1);
- strncpy (result, name, tmp - name);
- result[tmp - name] = '\0';
- return result;
- }
-
- return name;
+ 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;
}
-}
-static struct value *
-evaluate_subexp (struct type *expect_type, struct expression *exp, int *pos,
- enum noside noside)
-{
- return (*exp->language_defn->la_exp_desc->evaluate_exp)
- (expect_type, exp, pos, noside);
+ bound_val = ada_search_struct_field (bound, dval, 0, value_type (dval));
+ if (bound_val == NULL)
+ return 0;
+
+ *px = value_as_long (bound_val);
+ if (pnew_k != NULL)
+ *pnew_k = k;
+ return 1;
}
-/* Evaluate the subexpression of EXP starting at *POS as for
- evaluate_type, updating *POS to point just past the evaluated
- expression. */
+/* 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 *
-evaluate_subexp_type (struct expression *exp, int *pos)
+get_var_value (char *name, char *err_msg)
{
- return (*exp->language_defn->la_exp_desc->evaluate_exp)
- (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
-}
+ struct ada_symbol_info *syms;
+ int nsyms;
-/* If VAL is wrapped in an aligner or subtype wrapper, return the
- value it wraps. */
+ nsyms = ada_lookup_symbol_list (name, get_selected_block (0), VAR_DOMAIN,
+ &syms);
-static struct value *
-unwrap_value (struct value *val)
-{
- struct type *type = check_typedef (VALUE_TYPE (val));
- if (ada_is_aligner_type (type))
+ if (nsyms != 1)
{
- 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);
+ if (err_msg == NULL)
+ return 0;
+ else
+ error (("%s"), err_msg);
}
- else
- {
- 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
- (val, ada_to_fixed_type (raw_real_type, 0,
- VALUE_ADDRESS (val) + VALUE_OFFSET (val),
- NULL));
- }
+ return value_of_variable (syms[0].sym, syms[0].block);
}
-static struct value *
-cast_to_fixed (struct type *type, struct value *arg)
+/* Value of integer variable named NAME in the current environment. If
+ no such variable found, returns 0, and sets *FLAG to 0. If
+ successful, sets *FLAG to 1. */
+
+LONGEST
+get_int_var_value (char *name, int *flag)
{
- LONGEST val;
+ struct value *var_val = get_var_value (name, 0);
- if (type == VALUE_TYPE (arg))
- return arg;
- else if (ada_is_fixed_point_type (VALUE_TYPE (arg)))
- val = ada_float_to_fixed (type,
- ada_fixed_to_float (VALUE_TYPE (arg),
- value_as_long (arg)));
+ if (var_val == 0)
+ {
+ if (flag != NULL)
+ *flag = 0;
+ return 0;
+ }
else
{
- DOUBLEST argd =
- value_as_double (value_cast (builtin_type_double, value_copy (arg)));
- val = ada_float_to_fixed (type, argd);
+ if (flag != NULL)
+ *flag = 1;
+ return value_as_long (var_val);
}
-
- return value_from_longest (type, val);
}
-static struct value *
-cast_from_fixed_to_double (struct value *arg)
-{
- DOUBLEST val = ada_fixed_to_float (VALUE_TYPE (arg),
- value_as_long (arg));
- return value_from_double (builtin_type_double, val);
-}
-/* Coerce VAL as necessary for assignment to an lval of type TYPE, and
- return the converted value. */
+/* Return a range type whose base type is that of the range type named
+ NAME in the current environment, and whose bounds are calculated
+ from NAME according to the GNAT range encoding conventions.
+ Extract discriminant values, if needed, from DVAL. If a new type
+ must be created, allocate in OBJFILE's space. The bounds
+ information, in general, is encoded in NAME, the base type given in
+ the named range type. */
-static struct value *
-coerce_for_assign (struct type *type, struct value *val)
+static struct type *
+to_fixed_range_type (char *name, struct value *dval, struct objfile *objfile)
{
- struct type *type2 = VALUE_TYPE (val);
- if (type == type2)
- return val;
+ struct type *raw_type = ada_find_any_type (name);
+ struct type *base_type;
+ char *subtype_info;
- CHECK_TYPEDEF (type2);
- CHECK_TYPEDEF (type);
+ if (raw_type == NULL)
+ base_type = builtin_type_int;
+ else if (TYPE_CODE (raw_type) == TYPE_CODE_RANGE)
+ base_type = TYPE_TARGET_TYPE (raw_type);
+ else
+ base_type = raw_type;
- if (TYPE_CODE (type2) == TYPE_CODE_PTR
- && TYPE_CODE (type) == TYPE_CODE_ARRAY)
+ subtype_info = strstr (name, "___XD");
+ if (subtype_info == NULL)
+ return raw_type;
+ else
{
- val = ada_value_ind (val);
- type2 = VALUE_TYPE (val);
- }
+ static char *name_buf = NULL;
+ static size_t name_len = 0;
+ int prefix_len = subtype_info - name;
+ LONGEST L, U;
+ struct type *type;
+ char *bounds_str;
+ int n;
- 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)))
- error ("Incompatible types in assignment");
- VALUE_TYPE (val) = type;
- }
- return val;
-}
+ GROW_VECT (name_buf, name_len, prefix_len + 5);
+ strncpy (name_buf, name, prefix_len);
+ name_buf[prefix_len] = '\0';
-static struct value *
-ada_value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
-{
- struct value *val;
- struct type *type1, *type2;
- LONGEST v, v1, v2;
+ subtype_info += 5;
+ bounds_str = strchr (subtype_info, '_');
+ n = 1;
- COERCE_REF (arg1);
- COERCE_REF (arg2);
- type1 = base_type (check_typedef (VALUE_TYPE (arg1)));
- type2 = base_type (check_typedef (VALUE_TYPE (arg2)));
+ if (*subtype_info == 'L')
+ {
+ 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. */
+ n += 1;
+ subtype_info += 1;
+ }
+ else
+ {
+ int ok;
+ strcpy (name_buf + prefix_len, "___L");
+ L = get_int_var_value (name_buf, &ok);
+ if (!ok)
+ {
+ lim_warning (_("Unknown lower bound, using 1."));
+ L = 1;
+ }
+ }
- if (TYPE_CODE (type1) != TYPE_CODE_INT || TYPE_CODE (type2) != TYPE_CODE_INT)
- return value_binop (arg1, arg2, op);
+ if (*subtype_info == 'U')
+ {
+ if (!ada_scan_number (bounds_str, n, &U, &n)
+ && !scan_discrim_bound (bounds_str, n, dval, &U, &n))
+ return raw_type;
+ }
+ else
+ {
+ int ok;
+ strcpy (name_buf + prefix_len, "___U");
+ U = get_int_var_value (name_buf, &ok);
+ if (!ok)
+ {
+ lim_warning (_("Unknown upper bound, using %ld."), (long) L);
+ U = L;
+ }
+ }
- switch (op)
- {
- case BINOP_MOD:
- case BINOP_DIV:
- case BINOP_REM:
- break;
- default:
- return value_binop (arg1, arg2, op);
+ if (objfile == NULL)
+ objfile = TYPE_OBJFILE (base_type);
+ type = create_range_type (alloc_type (objfile), base_type, L, U);
+ TYPE_NAME (type) = name;
+ return type;
}
+}
- v2 = value_as_long (arg2);
- if (v2 == 0)
- error ("second operand of %s must not be zero.", op_string (op));
+/* True iff NAME is the name of a range type. */
- if (TYPE_UNSIGNED (type1) || op == BINOP_MOD)
- return value_binop (arg1, arg2, op);
+int
+ada_is_range_type_name (const char *name)
+{
+ return (name != NULL && strstr (name, "___XD"));
+}
+\f
- v1 = value_as_long (arg1);
- switch (op)
- {
- case BINOP_DIV:
- v = v1 / v2;
- if (! TRUNCATION_TOWARDS_ZERO && v1 * (v1%v2) < 0)
- v += v > 0 ? -1 : 1;
- break;
- case BINOP_REM:
- v = v1 % v2;
- if (v*v1 < 0)
- v -= v2;
- break;
- default:
- /* Should not reach this point. */
- v = 0;
- }
+ /* Modular types */
- val = allocate_value (type1);
- store_unsigned_integer (VALUE_CONTENTS_RAW (val),
- TYPE_LENGTH (VALUE_TYPE (val)),
- v);
- return val;
+/* True iff TYPE is an Ada modular type. */
+
+int
+ada_is_modular_type (struct type *type)
+{
+ struct type *subranged_type = base_type (type);
+
+ return (subranged_type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
+ && TYPE_CODE (subranged_type) != TYPE_CODE_ENUM
+ && TYPE_UNSIGNED (subranged_type));
}
-static int
-ada_value_equal (struct value *arg1, struct value *arg2)
+/* Assuming ada_is_modular_type (TYPE), the modulus of TYPE. */
+
+ULONGEST
+ada_modulus (struct type * type)
{
- if (ada_is_direct_array_type (VALUE_TYPE (arg1))
- || ada_is_direct_array_type (VALUE_TYPE (arg2)))
- {
- arg1 = ada_coerce_to_simple_array (arg1);
- arg2 = ada_coerce_to_simple_array (arg2);
- if (TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_ARRAY
- || TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_ARRAY)
- error ("Attempt to compare array with non-array");
- /* FIXME: The following works only for types whose
- representations use all bits (no padding or undefined bits)
- and do not have user-defined equality. */
- return
- TYPE_LENGTH (VALUE_TYPE (arg1)) == TYPE_LENGTH (VALUE_TYPE (arg2))
- && memcmp (VALUE_CONTENTS (arg1), VALUE_CONTENTS (arg2),
- TYPE_LENGTH (VALUE_TYPE (arg1))) == 0;
- }
- return value_equal (arg1, arg2);
+ return (ULONGEST) TYPE_HIGH_BOUND (type) + 1;
}
+\f
-struct value *
-ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
- int *pos, enum noside noside)
+/* Ada exception catchpoint support:
+ ---------------------------------
+
+ We support 3 kinds of exception catchpoints:
+ . catchpoints on Ada exceptions
+ . catchpoints on unhandled Ada exceptions
+ . catchpoints on failed assertions
+
+ Exceptions raised during failed assertions, or unhandled exceptions
+ could perfectly be caught with the general catchpoint on Ada exceptions.
+ However, we can easily differentiate these two special cases, and having
+ the option to distinguish these two cases from the rest can be useful
+ to zero-in on certain situations.
+
+ Exception catchpoints are a specialized form of breakpoint,
+ since they rely on inserting breakpoints inside known routines
+ of the GNAT runtime. The implementation therefore uses a standard
+ breakpoint structure of the BP_BREAKPOINT type, but with its own set
+ of breakpoint_ops.
+
+ Support in the runtime for exception catchpoints have been changed
+ a few times already, and these changes affect the implementation
+ of these catchpoints. In order to be able to support several
+ variants of the runtime, we use a sniffer that will determine
+ the runtime variant used by the program being debugged.
+
+ At this time, we do not support the use of conditions on Ada exception
+ catchpoints. The COND and COND_STRING fields are therefore set
+ to NULL (most of the time, see below).
+
+ Conditions where EXP_STRING, COND, and COND_STRING are used:
+
+ When a user specifies the name of a specific exception in the case
+ of catchpoints on Ada exceptions, we store the name of that exception
+ in the EXP_STRING. We then translate this request into an actual
+ condition stored in COND_STRING, and then parse it into an expression
+ stored in COND. */
+
+/* The different types of catchpoints that we introduced for catching
+ Ada exceptions. */
+
+enum exception_catchpoint_kind
{
- enum exp_opcode op;
- int tem, tem2, tem3;
- int pc;
- struct value *arg1 = NULL, *arg2 = NULL, *arg3;
- struct type *type;
- int nargs;
- struct value **argvec;
+ ex_catch_exception,
+ ex_catch_exception_unhandled,
+ ex_catch_assert
+};
- pc = *pos;
- *pos += 1;
- op = exp->elts[pc].opcode;
+typedef CORE_ADDR (ada_unhandled_exception_name_addr_ftype) (void);
- switch (op)
- {
- default:
- *pos -= 1;
- return
- unwrap_value (evaluate_subexp_standard
- (expect_type, exp, pos, noside));
+/* A structure that describes how to support exception catchpoints
+ for a given executable. */
- case OP_STRING:
- {
- struct value *result;
- *pos -= 1;
- result = evaluate_subexp_standard (expect_type, exp, pos, noside);
- /* The result type will have code OP_STRING, bashed there from
- OP_ARRAY. Bash it back. */
- if (TYPE_CODE (VALUE_TYPE (result)) == TYPE_CODE_STRING)
- TYPE_CODE (VALUE_TYPE (result)) = TYPE_CODE_ARRAY;
- return result;
- }
+struct exception_support_info
+{
+ /* The name of the symbol to break on in order to insert
+ a catchpoint on exceptions. */
+ const char *catch_exception_sym;
- case UNOP_CAST:
- (*pos) += 2;
- type = exp->elts[pc + 1].type;
- arg1 = evaluate_subexp (type, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- if (type != check_typedef (VALUE_TYPE (arg1)))
- {
- if (ada_is_fixed_point_type (type))
- 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)
- {
- /* 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)
- return value_zero (to_static_fixed_type (type), not_lval);
- arg1 =
- ada_to_fixed_value_create
- (type, VALUE_ADDRESS (arg1) + VALUE_OFFSET (arg1), 0);
- }
- else
- arg1 = value_cast (type, arg1);
- }
- return arg1;
+ /* The name of the symbol to break on in order to insert
+ a catchpoint on unhandled exceptions. */
+ const char *catch_exception_unhandled_sym;
- case UNOP_QUAL:
- (*pos) += 2;
- type = exp->elts[pc + 1].type;
- return ada_evaluate_subexp (type, exp, pos, noside);
+ /* The name of the symbol to break on in order to insert
+ a catchpoint on failed assertions. */
+ const char *catch_assert_sym;
- case BINOP_ASSIGN:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- arg2 = evaluate_subexp (VALUE_TYPE (arg1), exp, pos, noside);
- if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
- return arg1;
- 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
- arg2 = coerce_for_assign (VALUE_TYPE (arg1), arg2);
- return ada_value_assign (arg1, arg2);
+ /* Assuming that the inferior just triggered an unhandled exception
+ catchpoint, this function is responsible for returning the address
+ in inferior memory where the name of that exception is stored.
+ Return zero if the address could not be computed. */
+ ada_unhandled_exception_name_addr_ftype *unhandled_exception_name_addr;
+};
- case BINOP_ADD:
- arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
- arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- 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");
- return value_cast (VALUE_TYPE (arg1), value_add (arg1, arg2));
+static CORE_ADDR ada_unhandled_exception_name_addr (void);
+static CORE_ADDR ada_unhandled_exception_name_addr_from_raise (void);
- case BINOP_SUB:
- arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
- arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- 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");
- return value_cast (VALUE_TYPE (arg1), value_sub (arg1, arg2));
+/* The following exception support info structure describes how to
+ implement exception catchpoints with the latest version of the
+ Ada runtime (as of 2007-03-06). */
- case BINOP_MUL:
- case BINOP_DIV:
- 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
- && (op == BINOP_DIV || op == BINOP_REM || op == BINOP_MOD))
- return value_zero (VALUE_TYPE (arg1), not_lval);
- else
- {
- if (ada_is_fixed_point_type (VALUE_TYPE (arg1)))
- arg1 = cast_from_fixed_to_double (arg1);
- if (ada_is_fixed_point_type (VALUE_TYPE (arg2)))
- arg2 = cast_from_fixed_to_double (arg2);
- return ada_value_binop (arg1, arg2, op);
- }
+static const struct exception_support_info default_exception_support_info =
+{
+ "__gnat_debug_raise_exception", /* catch_exception_sym */
+ "__gnat_unhandled_exception", /* catch_exception_unhandled_sym */
+ "__gnat_debug_raise_assert_failure", /* catch_assert_sym */
+ ada_unhandled_exception_name_addr
+};
- case BINOP_REM:
- case BINOP_MOD:
- 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
- && (op == BINOP_DIV || op == BINOP_REM || op == BINOP_MOD))
- return value_zero (VALUE_TYPE (arg1), not_lval);
- else
- return ada_value_binop (arg1, arg2, op);
+/* The following exception support info structure describes how to
+ implement exception catchpoints with a slightly older version
+ of the Ada runtime. */
- case BINOP_EQUAL:
- case BINOP_NOTEQUAL:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- arg2 = evaluate_subexp (VALUE_TYPE (arg1), exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- tem = 0;
- else
- tem = ada_value_equal (arg1, arg2);
- if (op == BINOP_NOTEQUAL)
- tem = ! tem;
- return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+static const struct exception_support_info exception_support_info_fallback =
+{
+ "__gnat_raise_nodefer_with_msg", /* catch_exception_sym */
+ "__gnat_unhandled_exception", /* catch_exception_unhandled_sym */
+ "system__assertions__raise_assert_failure", /* catch_assert_sym */
+ ada_unhandled_exception_name_addr_from_raise
+};
- case UNOP_NEG:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- else if (ada_is_fixed_point_type (VALUE_TYPE (arg1)))
- return value_cast (VALUE_TYPE (arg1), value_neg (arg1));
- else
- return value_neg (arg1);
+/* For each executable, we sniff which exception info structure to use
+ and cache it in the following global variable. */
- case OP_VAR_VALUE:
- *pos -= 1;
- if (noside == EVAL_SKIP)
- {
- *pos += 4;
- goto nosideret;
- }
- else if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN)
- /* Only encountered when an unresolved symbol occurs in a
- context other than a function call, in which case, it is
- illegal. */
- error ("Unexpected unresolved symbol, %s, during evaluation",
- SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
- 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))),
- not_lval);
- }
- else
- {
- arg1 =
- unwrap_value (evaluate_subexp_standard
- (expect_type, exp, pos, noside));
- return ada_to_fixed_value (arg1);
- }
+static const struct exception_support_info *exception_info = NULL;
- case OP_FUNCALL:
- (*pos) += 2;
+/* Inspect the Ada runtime and determine which exception info structure
+ should be used to provide support for exception catchpoints.
- /* Allocate arg vector, including space for the function to be
- 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));
+ This function will always set exception_info, or raise an error. */
- if (exp->elts[*pos].opcode == OP_VAR_VALUE
- && SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
- error ("Unexpected unresolved symbol, %s, during evaluation",
- SYMBOL_PRINT_NAME (exp->elts[pc + 5].symbol));
- else
- {
- for (tem = 0; tem <= nargs; tem += 1)
- argvec[tem] = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- argvec[tem] = 0;
+static void
+ada_exception_support_info_sniffer (void)
+{
+ struct symbol *sym;
- if (noside == EVAL_SKIP)
- goto nosideret;
- }
+ /* If the exception info is already known, then no need to recompute it. */
+ if (exception_info != NULL)
+ return;
- if (ada_is_packed_array_type (desc_base_type (VALUE_TYPE (argvec[0]))))
- argvec[0] = ada_coerce_to_simple_array (argvec[0]);
- else if (TYPE_CODE (VALUE_TYPE (argvec[0])) == TYPE_CODE_REF
- || (TYPE_CODE (VALUE_TYPE (argvec[0])) == TYPE_CODE_ARRAY
- && VALUE_LVAL (argvec[0]) == lval_memory))
- argvec[0] = value_addr (argvec[0]);
+ /* Check the latest (default) exception support info. */
+ sym = standard_lookup (default_exception_support_info.catch_exception_sym,
+ NULL, VAR_DOMAIN);
+ if (sym != NULL)
+ {
+ exception_info = &default_exception_support_info;
+ return;
+ }
- 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:
- type = check_typedef (TYPE_TARGET_TYPE (type));
- break;
- case TYPE_CODE_ARRAY:
- break;
- case TYPE_CODE_STRUCT:
- if (noside != EVAL_AVOID_SIDE_EFFECTS)
- argvec[0] = ada_value_ind (argvec[0]);
- type = check_typedef (TYPE_TARGET_TYPE (type));
- break;
- default:
- error ("cannot subscript or call something of type `%s'",
- ada_type_name (VALUE_TYPE (argvec[0])));
- break;
- }
- }
+ /* Try our fallback exception suport info. */
+ sym = standard_lookup (exception_support_info_fallback.catch_exception_sym,
+ NULL, VAR_DOMAIN);
+ if (sym != NULL)
+ {
+ exception_info = &exception_support_info_fallback;
+ return;
+ }
- 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:
- {
- int arity;
+ /* Sometimes, it is normal for us to not be able to find the routine
+ we are looking for. This happens when the program is linked with
+ the shared version of the GNAT runtime, and the program has not been
+ started yet. Inform the user of these two possible causes if
+ applicable. */
- /* Make sure to use the parallel ___XVS type if any.
- Otherwise, we won't be able to find the array arity
- and element type. */
- type = ada_get_base_type (type);
+ if (ada_update_initial_language (language_unknown, NULL) != language_ada)
+ error (_("Unable to insert catchpoint. Is this an Ada main program?"));
- arity = ada_array_arity (type);
- type = ada_array_element_type (type, nargs);
- if (type == NULL)
- error ("cannot subscript or call a record");
- if (arity != nargs)
- error ("wrong number of subscripts; expecting %d", arity);
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return allocate_value (ada_aligned_type (type));
- 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
- unwrap_value (ada_value_subscript
- (ada_coerce_to_simple_array (argvec[0]),
- 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));
+ /* If the symbol does not exist, then check that the program is
+ already started, to make sure that shared libraries have been
+ loaded. If it is not started, this may mean that the symbol is
+ in a shared library. */
- default:
- error ("Internal error in evaluate_subexp");
- }
+ if (ptid_get_pid (inferior_ptid) == 0)
+ error (_("Unable to insert catchpoint. Try to start the program first."));
- case TERNOP_SLICE:
- {
- struct value *array = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- struct value *low_bound_val =
- evaluate_subexp (NULL_TYPE, exp, pos, noside);
- LONGEST low_bound = pos_atr (low_bound_val);
- LONGEST high_bound
- = pos_atr (evaluate_subexp (NULL_TYPE, exp, pos, noside));
- if (noside == EVAL_SKIP)
- goto nosideret;
+ /* At this point, we know that we are debugging an Ada program and
+ that the inferior has been started, but we still are not able to
+ find the run-time symbols. That can mean that we are in
+ configurable run time mode, or that a-except as been optimized
+ out by the linker... In any case, at this point it is not worth
+ supporting this feature. */
- /* If this is a reference type or a pointer type, and
- the target type has an XVS parallel type, then get
- the real target type. */
- if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_REF
- || TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_PTR)
- TYPE_TARGET_TYPE (VALUE_TYPE (array)) =
- ada_get_base_type (TYPE_TARGET_TYPE (VALUE_TYPE (array)));
+ error (_("Cannot insert catchpoints in this configuration."));
+}
- /* If this is a reference to an aligner type, then remove all
- the aligners. */
- if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_REF
- && ada_is_aligner_type (TYPE_TARGET_TYPE (VALUE_TYPE (array))))
- TYPE_TARGET_TYPE (VALUE_TYPE (array)) =
- ada_aligned_type (TYPE_TARGET_TYPE (VALUE_TYPE (array)));
+/* An observer of "executable_changed" events.
+ Its role is to clear certain cached values that need to be recomputed
+ each time a new executable is loaded by GDB. */
- if (ada_is_packed_array_type (VALUE_TYPE (array)))
- error ("cannot slice a packed array");
+static void
+ada_executable_changed_observer (void *unused)
+{
+ /* If the executable changed, then it is possible that the Ada runtime
+ is different. So we need to invalidate the exception support info
+ cache. */
+ exception_info = NULL;
+}
- /* If this is a reference to an array or an array lvalue,
- convert to a pointer. */
- if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_REF
- || (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_ARRAY
- && VALUE_LVAL (array) == lval_memory))
- array = value_addr (array);
+/* Return the name of the function at PC, NULL if could not find it.
+ This function only checks the debugging information, not the symbol
+ table. */
- if (noside == EVAL_AVOID_SIDE_EFFECTS &&
- ada_is_array_descriptor_type (check_typedef (VALUE_TYPE (array))))
- {
- /* Try dereferencing the array, in case it is an access
- to array. */
- struct type *arrType = ada_type_of_array (array, 0);
- if (arrType != NULL)
- array = value_at_lazy (arrType, 0, NULL);
- }
+static char *
+function_name_from_pc (CORE_ADDR pc)
+{
+ char *func_name;
- array = ada_coerce_to_simple_array_ptr (array);
+ if (!find_pc_partial_function (pc, &func_name, NULL, NULL))
+ return NULL;
- /* When EVAL_AVOID_SIDE_EFFECTS, we may get the bounds wrong,
- but only in contexts where the value is not being requested
- (FIXME?). */
- if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_PTR)
- {
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return ada_value_ind (array);
- else if (high_bound < low_bound)
- return empty_array (TYPE_TARGET_TYPE (VALUE_TYPE (array)),
- low_bound);
- else
- {
- struct type *arr_type0 =
- to_fixed_array_type (TYPE_TARGET_TYPE (VALUE_TYPE (array)),
- NULL, 1);
- struct value *item0 =
- ada_value_ptr_subscript (array, arr_type0, 1,
- &low_bound_val);
- struct value *slice =
- value_repeat (item0, high_bound - low_bound + 1);
- struct type *arr_type1 = VALUE_TYPE (slice);
- TYPE_LOW_BOUND (TYPE_INDEX_TYPE (arr_type1)) = low_bound;
- TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (arr_type1)) += low_bound;
- return slice;
- }
- }
- else if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return array;
- else if (high_bound < low_bound)
- return empty_array (VALUE_TYPE (array), low_bound);
- else
- return value_slice (array, low_bound, high_bound - low_bound + 1);
- }
+ return func_name;
+}
- case UNOP_IN_RANGE:
- (*pos) += 2;
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- type = exp->elts[pc + 1].type;
+/* True iff FRAME is very likely to be that of a function that is
+ part of the runtime system. This is all very heuristic, but is
+ intended to be used as advice as to what frames are uninteresting
+ to most users. */
- if (noside == EVAL_SKIP)
- goto nosideret;
+static int
+is_known_support_routine (struct frame_info *frame)
+{
+ struct symtab_and_line sal;
+ char *func_name;
+ int i;
- switch (TYPE_CODE (type))
- {
- default:
- lim_warning ("Membership test incompletely implemented; "
- "always returns true", 0);
- return value_from_longest (builtin_type_int, (LONGEST) 1);
+ /* If this code does not have any debugging information (no symtab),
+ This cannot be any user code. */
- case TYPE_CODE_RANGE:
- arg2 = value_from_longest (builtin_type_int,
- TYPE_LOW_BOUND (type));
- arg3 = value_from_longest (builtin_type_int,
- 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)));
- }
+ find_frame_sal (frame, &sal);
+ if (sal.symtab == NULL)
+ return 1;
- case BINOP_IN_BOUNDS:
- (*pos) += 2;
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ /* If there is a symtab, but the associated source file cannot be
+ located, then assume this is not user code: Selecting a frame
+ for which we cannot display the code would not be very helpful
+ for the user. This should also take care of case such as VxWorks
+ where the kernel has some debugging info provided for a few units. */
- if (noside == EVAL_SKIP)
- goto nosideret;
+ if (symtab_to_fullname (sal.symtab) == NULL)
+ return 1;
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return value_zero (builtin_type_int, not_lval);
+ /* Check the unit filename againt the Ada runtime file naming.
+ We also check the name of the objfile against the name of some
+ known system libraries that sometimes come with debugging info
+ too. */
- tem = longest_to_int (exp->elts[pc + 1].longconst);
+ for (i = 0; known_runtime_file_name_patterns[i] != NULL; i += 1)
+ {
+ re_comp (known_runtime_file_name_patterns[i]);
+ if (re_exec (sal.symtab->filename))
+ return 1;
+ if (sal.symtab->objfile != NULL
+ && re_exec (sal.symtab->objfile->name))
+ return 1;
+ }
- if (tem < 1 || tem > ada_array_arity (VALUE_TYPE (arg2)))
- error ("invalid dimension number to '%s", "range");
+ /* Check whether the function is a GNAT-generated entity. */
- arg3 = ada_array_bound (arg2, tem, 1);
- arg2 = ada_array_bound (arg2, tem, 0);
+ func_name = function_name_from_pc (get_frame_address_in_block (frame));
+ if (func_name == NULL)
+ return 1;
- return
- value_from_longest (builtin_type_int,
- (value_less (arg1, arg3)
- || value_equal (arg1, arg3))
- && (value_less (arg2, arg1)
- || value_equal (arg2, arg1)));
+ for (i = 0; known_auxiliary_function_name_patterns[i] != NULL; i += 1)
+ {
+ re_comp (known_auxiliary_function_name_patterns[i]);
+ if (re_exec (func_name))
+ return 1;
+ }
- case TERNOP_IN_RANGE:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- arg3 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+ return 0;
+}
- if (noside == EVAL_SKIP)
- goto nosideret;
+/* Find the first frame that contains debugging information and that is not
+ part of the Ada run-time, starting from FI and moving upward. */
- return
- value_from_longest (builtin_type_int,
- (value_less (arg1, arg3)
- || value_equal (arg1, arg3))
- && (value_less (arg2, arg1)
- || value_equal (arg2, arg1)));
+static void
+ada_find_printable_frame (struct frame_info *fi)
+{
+ for (; fi != NULL; fi = get_prev_frame (fi))
+ {
+ if (!is_known_support_routine (fi))
+ {
+ select_frame (fi);
+ break;
+ }
+ }
- case OP_ATR_FIRST:
- case OP_ATR_LAST:
- case OP_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 + 2].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 (op));
- tem = longest_to_int (exp->elts[*pos + 2].longconst);
- *pos += 4;
+/* Assuming that the inferior just triggered an unhandled exception
+ catchpoint, return the address in inferior memory where the name
+ of the exception is stored.
+
+ Return zero if the address could not be computed. */
- if (noside == EVAL_SKIP)
- goto nosideret;
+static CORE_ADDR
+ada_unhandled_exception_name_addr (void)
+{
+ return parse_and_eval_address ("e.full_name");
+}
- 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 (op));
-
- 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 (op)
- {
- default: /* Should never happen. */
- error ("unexpected attribute encountered");
- case OP_ATR_FIRST:
- return ada_array_bound (arg1, tem, 0);
- case OP_ATR_LAST:
- return ada_array_bound (arg1, tem, 1);
- case OP_ATR_LENGTH:
- return ada_array_length (arg1, tem);
- }
- }
- else if (discrete_type_p (type_arg))
- {
- struct type *range_type;
- char *name = ada_type_name (type_arg);
- range_type = NULL;
- if (name != NULL && TYPE_CODE (type_arg) != TYPE_CODE_ENUM)
- range_type =
- to_fixed_range_type (name, NULL, TYPE_OBJFILE (type_arg));
- if (range_type == NULL)
- range_type = type_arg;
- switch (op)
- {
- default:
- error ("unexpected attribute encountered");
- case OP_ATR_FIRST:
- return discrete_type_low_bound (range_type);
- case OP_ATR_LAST:
- return discrete_type_high_bound (range_type);
- case OP_ATR_LENGTH:
- error ("the 'length attribute applies only to array types");
- }
- }
- 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 (op));
-
- type = ada_index_type (type_arg, tem);
- if (type == NULL)
- error ("attempt to take bound of something that is not an array");
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return allocate_value (type);
-
- switch (op)
- {
- default:
- error ("unexpected attribute encountered");
- case OP_ATR_FIRST:
- low = ada_array_bound_from_type (type_arg, tem, 0, &type);
- return value_from_longest (type, low);
- case OP_ATR_LAST:
- high =
- ada_array_bound_from_type (type_arg, tem, 1, &type);
- return value_from_longest (type, high);
- case OP_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);
- }
- }
- }
+/* Same as ada_unhandled_exception_name_addr, except that this function
+ should be used when the inferior uses an older version of the runtime,
+ where the exception name needs to be extracted from a specific frame
+ several frames up in the callstack. */
- case OP_ATR_TAG:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
+static CORE_ADDR
+ada_unhandled_exception_name_addr_from_raise (void)
+{
+ int frame_level;
+ struct frame_info *fi;
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return value_zero (ada_tag_type (arg1), not_lval);
+ /* To determine the name of this exception, we need to select
+ the frame corresponding to RAISE_SYM_NAME. This frame is
+ at least 3 levels up, so we simply skip the first 3 frames
+ without checking the name of their associated function. */
+ fi = get_current_frame ();
+ for (frame_level = 0; frame_level < 3; frame_level += 1)
+ if (fi != NULL)
+ fi = get_prev_frame (fi);
- return ada_value_tag (arg1);
+ while (fi != NULL)
+ {
+ const char *func_name =
+ function_name_from_pc (get_frame_address_in_block (fi));
+ if (func_name != NULL
+ && strcmp (func_name, exception_info->catch_exception_sym) == 0)
+ break; /* We found the frame we were looking for... */
+ fi = get_prev_frame (fi);
+ }
- case OP_ATR_MIN:
- case OP_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,
- op == OP_ATR_MIN ? BINOP_MIN : BINOP_MAX);
+ if (fi == NULL)
+ return 0;
- case OP_ATR_MODULUS:
- {
- struct type *type_arg = exp->elts[pc + 2].type;
- evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
+ select_frame (fi);
+ return parse_and_eval_address ("id.full_name");
+}
- if (noside == EVAL_SKIP)
- goto nosideret;
+/* Assuming the inferior just triggered an Ada exception catchpoint
+ (of any type), return the address in inferior memory where the name
+ of the exception is stored, if applicable.
- if (!ada_is_modular_type (type_arg))
- error ("'modulus must be applied to modular type");
+ Return zero if the address could not be computed, or if not relevant. */
- return value_from_longest (TYPE_TARGET_TYPE (type_arg),
- ada_modulus (type_arg));
- }
+static CORE_ADDR
+ada_exception_name_addr_1 (enum exception_catchpoint_kind ex,
+ struct breakpoint *b)
+{
+ switch (ex)
+ {
+ case ex_catch_exception:
+ return (parse_and_eval_address ("e.full_name"));
+ break;
+ case ex_catch_exception_unhandled:
+ return exception_info->unhandled_exception_name_addr ();
+ break;
+
+ case ex_catch_assert:
+ return 0; /* Exception name is not relevant in this case. */
+ break;
- case OP_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);
+ default:
+ internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
+ break;
+ }
- case OP_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)));
+ return 0; /* Should never be reached. */
+}
- case OP_ATR_VAL:
- evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- type = exp->elts[pc + 2].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);
+/* Same as ada_exception_name_addr_1, except that it intercepts and contains
+ any error that ada_exception_name_addr_1 might cause to be thrown.
+ When an error is intercepted, a warning with the error message is printed,
+ and zero is returned. */
- case BINOP_EXP:
- 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, op);
+static CORE_ADDR
+ada_exception_name_addr (enum exception_catchpoint_kind ex,
+ struct breakpoint *b)
+{
+ struct gdb_exception e;
+ CORE_ADDR result = 0;
- case UNOP_PLUS:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- else
- return arg1;
+ TRY_CATCH (e, RETURN_MASK_ERROR)
+ {
+ result = ada_exception_name_addr_1 (ex, b);
+ }
- case UNOP_ABS:
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- if (value_less (arg1, value_zero (VALUE_TYPE (arg1), not_lval)))
- return value_neg (arg1);
- else
- return arg1;
+ if (e.reason < 0)
+ {
+ warning (_("failed to get exception name: %s"), e.message);
+ return 0;
+ }
- case UNOP_IND:
- if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR)
- expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type));
- arg1 = evaluate_subexp (expect_type, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- type = check_typedef (VALUE_TYPE (arg1));
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- {
- if (ada_is_array_descriptor_type (type))
- /* GDB allows dereferencing GNAT array descriptors. */
- {
- 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);
- else if (TYPE_CODE (type) == TYPE_CODE_INT)
- /* GDB allows dereferencing an int. */
- return value_zero (builtin_type_int, lval_memory);
- else
- error ("Attempt to take contents of a non-pointer value.");
- }
- arg1 = ada_coerce_ref (arg1); /* FIXME: What is this for?? */
- type = check_typedef (VALUE_TYPE (arg1));
+ return result;
+}
- if (ada_is_array_descriptor_type (type))
- /* GDB allows dereferencing GNAT array descriptors. */
- return ada_coerce_to_simple_array (arg1);
- else
- return ada_value_ind (arg1);
+/* Implement the PRINT_IT method in the breakpoint_ops structure
+ for all exception catchpoint kinds. */
- case STRUCTOP_STRUCT:
- tem = longest_to_int (exp->elts[pc + 1].longconst);
- (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
- arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
- if (noside == EVAL_SKIP)
- goto nosideret;
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- {
- struct type *type1 = VALUE_TYPE (arg1);
- if (ada_is_tagged_type (type1, 1))
- {
- type = ada_lookup_struct_elt_type (type1,
- &exp->elts[pc + 2].string,
- 1, 1, NULL);
- if (type == NULL)
- /* In this case, we assume that the field COULD exist
- in some extension of the type. Return an object of
- "type" void, which will match any formal
- (see ada_type_match). */
- return value_zero (builtin_type_void, lval_memory);
- }
- else
- type = ada_lookup_struct_elt_type (type1, &exp->elts[pc + 2].string,
- 1, 0, NULL);
+static enum print_stop_action
+print_it_exception (enum exception_catchpoint_kind ex, struct breakpoint *b)
+{
+ const CORE_ADDR addr = ada_exception_name_addr (ex, b);
+ char exception_name[256];
- return value_zero (ada_aligned_type (type), lval_memory);
- }
- else
- return
- ada_to_fixed_value (unwrap_value
- (ada_value_struct_elt
- (arg1, &exp->elts[pc + 2].string, "record")));
- case OP_TYPE:
- /* The value is not supposed to be used. This is here to make it
- easier to accommodate expressions that contain types. */
- (*pos) += 2;
- if (noside == EVAL_SKIP)
- goto nosideret;
- else if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return allocate_value (builtin_type_void);
- else
- error ("Attempt to use a type name as an expression");
+ if (addr != 0)
+ {
+ read_memory (addr, exception_name, sizeof (exception_name) - 1);
+ exception_name [sizeof (exception_name) - 1] = '\0';
}
-nosideret:
- return value_from_longest (builtin_type_long, (LONGEST) 1);
-}
-\f
+ ada_find_printable_frame (get_current_frame ());
- /* Fixed point */
+ annotate_catchpoint (b->number);
+ switch (ex)
+ {
+ case ex_catch_exception:
+ if (addr != 0)
+ printf_filtered (_("\nCatchpoint %d, %s at "),
+ b->number, exception_name);
+ else
+ printf_filtered (_("\nCatchpoint %d, exception at "), b->number);
+ break;
+ case ex_catch_exception_unhandled:
+ if (addr != 0)
+ printf_filtered (_("\nCatchpoint %d, unhandled %s at "),
+ b->number, exception_name);
+ else
+ printf_filtered (_("\nCatchpoint %d, unhandled exception at "),
+ b->number);
+ break;
+ case ex_catch_assert:
+ printf_filtered (_("\nCatchpoint %d, failed assertion at "),
+ b->number);
+ break;
+ }
-/* 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. */
+ return PRINT_SRC_AND_LOC;
+}
-static const char *
-fixed_type_info (struct type *type)
-{
- const char *name = ada_type_name (type);
- enum type_code code = (type == NULL) ? TYPE_CODE_UNDEF : TYPE_CODE (type);
+/* Implement the PRINT_ONE method in the breakpoint_ops structure
+ for all exception catchpoint kinds. */
- if ((code == TYPE_CODE_INT || code == TYPE_CODE_RANGE) && name != NULL)
+static void
+print_one_exception (enum exception_catchpoint_kind ex,
+ struct breakpoint *b, CORE_ADDR *last_addr)
+{
+ if (addressprint)
{
- const char *tail = strstr (name, "___XF_");
- if (tail == NULL)
- return NULL;
- else
- return tail + 5;
+ annotate_field (4);
+ ui_out_field_core_addr (uiout, "addr", b->loc->address);
}
- else if (code == TYPE_CODE_RANGE && TYPE_TARGET_TYPE (type) != type)
- return fixed_type_info (TYPE_TARGET_TYPE (type));
- else
- return NULL;
-}
-/* Returns non-zero iff TYPE represents an Ada fixed-point type. */
+ annotate_field (5);
+ *last_addr = b->loc->address;
+ switch (ex)
+ {
+ case ex_catch_exception:
+ if (b->exp_string != NULL)
+ {
+ char *msg = xstrprintf (_("`%s' Ada exception"), b->exp_string);
+
+ ui_out_field_string (uiout, "what", msg);
+ xfree (msg);
+ }
+ else
+ ui_out_field_string (uiout, "what", "all Ada exceptions");
+
+ break;
-int
-ada_is_fixed_point_type (struct type *type)
-{
- return fixed_type_info (type) != NULL;
+ case ex_catch_exception_unhandled:
+ ui_out_field_string (uiout, "what", "unhandled Ada exceptions");
+ break;
+
+ case ex_catch_assert:
+ ui_out_field_string (uiout, "what", "failed Ada assertions");
+ break;
+
+ default:
+ internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
+ break;
+ }
}
-/* Return non-zero iff TYPE represents a System.Address type. */
+/* Implement the PRINT_MENTION method in the breakpoint_ops structure
+ for all exception catchpoint kinds. */
-int
-ada_is_system_address_type (struct type *type)
+static void
+print_mention_exception (enum exception_catchpoint_kind ex,
+ struct breakpoint *b)
{
- return (TYPE_NAME (type)
- && strcmp (TYPE_NAME (type), "system__address") == 0);
+ switch (ex)
+ {
+ case ex_catch_exception:
+ if (b->exp_string != NULL)
+ printf_filtered (_("Catchpoint %d: `%s' Ada exception"),
+ b->number, b->exp_string);
+ else
+ printf_filtered (_("Catchpoint %d: all Ada exceptions"), b->number);
+
+ break;
+
+ case ex_catch_exception_unhandled:
+ printf_filtered (_("Catchpoint %d: unhandled Ada exceptions"),
+ b->number);
+ break;
+
+ case ex_catch_assert:
+ printf_filtered (_("Catchpoint %d: failed Ada assertions"), b->number);
+ break;
+
+ default:
+ internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
+ break;
+ }
}
-/* Assuming that TYPE is the representation of an Ada fixed-point
- type, return its delta, or -1 if the type is malformed and the
- delta cannot be determined. */
+/* Virtual table for "catch exception" breakpoints. */
+
+static enum print_stop_action
+print_it_catch_exception (struct breakpoint *b)
+{
+ return print_it_exception (ex_catch_exception, b);
+}
-DOUBLEST
-ada_delta (struct type *type)
+static void
+print_one_catch_exception (struct breakpoint *b, CORE_ADDR *last_addr)
{
- const char *encoding = fixed_type_info (type);
- long num, den;
+ print_one_exception (ex_catch_exception, b, last_addr);
+}
- if (sscanf (encoding, "_%ld_%ld", &num, &den) < 2)
- return -1.0;
- else
- return (DOUBLEST) num / (DOUBLEST) den;
+static void
+print_mention_catch_exception (struct breakpoint *b)
+{
+ print_mention_exception (ex_catch_exception, b);
}
-/* Assuming that ada_is_fixed_point_type (TYPE), return the scaling
- factor ('SMALL value) associated with the type. */
+static struct breakpoint_ops catch_exception_breakpoint_ops =
+{
+ print_it_catch_exception,
+ print_one_catch_exception,
+ print_mention_catch_exception
+};
-static DOUBLEST
-scaling_factor (struct type *type)
+/* Virtual table for "catch exception unhandled" breakpoints. */
+
+static enum print_stop_action
+print_it_catch_exception_unhandled (struct breakpoint *b)
{
- const char *encoding = fixed_type_info (type);
- unsigned long num0, den0, num1, den1;
- int n;
+ return print_it_exception (ex_catch_exception_unhandled, b);
+}
- n = sscanf (encoding, "_%lu_%lu_%lu_%lu", &num0, &den0, &num1, &den1);
+static void
+print_one_catch_exception_unhandled (struct breakpoint *b, CORE_ADDR *last_addr)
+{
+ print_one_exception (ex_catch_exception_unhandled, b, last_addr);
+}
- if (n < 2)
- return 1.0;
- else if (n == 4)
- return (DOUBLEST) num1 / (DOUBLEST) den1;
- else
- return (DOUBLEST) num0 / (DOUBLEST) den0;
+static void
+print_mention_catch_exception_unhandled (struct breakpoint *b)
+{
+ print_mention_exception (ex_catch_exception_unhandled, b);
}
+static struct breakpoint_ops catch_exception_unhandled_breakpoint_ops = {
+ print_it_catch_exception_unhandled,
+ print_one_catch_exception_unhandled,
+ print_mention_catch_exception_unhandled
+};
-/* Assuming that X is the representation of a value of fixed-point
- type TYPE, return its floating-point equivalent. */
+/* Virtual table for "catch assert" breakpoints. */
-DOUBLEST
-ada_fixed_to_float (struct type *type, LONGEST x)
+static enum print_stop_action
+print_it_catch_assert (struct breakpoint *b)
{
- return (DOUBLEST) x *scaling_factor (type);
+ return print_it_exception (ex_catch_assert, b);
}
-/* The representation of a fixed-point value of type TYPE
- corresponding to the value X. */
-
-LONGEST
-ada_float_to_fixed (struct type *type, DOUBLEST x)
+static void
+print_one_catch_assert (struct breakpoint *b, CORE_ADDR *last_addr)
{
- return (LONGEST) (x / scaling_factor (type) + 0.5);
+ print_one_exception (ex_catch_assert, b, last_addr);
}
+static void
+print_mention_catch_assert (struct breakpoint *b)
+{
+ print_mention_exception (ex_catch_assert, b);
+}
- /* VAX floating formats */
+static struct breakpoint_ops catch_assert_breakpoint_ops = {
+ print_it_catch_assert,
+ print_one_catch_assert,
+ print_mention_catch_assert
+};
-/* Non-zero iff TYPE represents one of the special VAX floating-point
- types. */
+/* Return non-zero if B is an Ada exception catchpoint. */
int
-ada_is_vax_floating_type (struct type *type)
+ada_exception_catchpoint_p (struct breakpoint *b)
{
- int name_len =
- (ada_type_name (type) == NULL) ? 0 : strlen (ada_type_name (type));
- return
- name_len > 6
- && (TYPE_CODE (type) == TYPE_CODE_INT
- || TYPE_CODE (type) == TYPE_CODE_RANGE)
- && strncmp (ada_type_name (type) + name_len - 6, "___XF", 5) == 0;
+ return (b->ops == &catch_exception_breakpoint_ops
+ || b->ops == &catch_exception_unhandled_breakpoint_ops
+ || b->ops == &catch_assert_breakpoint_ops);
}
-/* The type of special VAX floating-point type this is, assuming
- ada_is_vax_floating_point. */
+/* Return a newly allocated copy of the first space-separated token
+ in ARGSP, and then adjust ARGSP to point immediately after that
+ token.
-int
-ada_vax_float_type_suffix (struct type *type)
+ Return NULL if ARGPS does not contain any more tokens. */
+
+static char *
+ada_get_next_arg (char **argsp)
{
- return ada_type_name (type)[strlen (ada_type_name (type)) - 1];
+ char *args = *argsp;
+ char *end;
+ char *result;
+
+ /* Skip any leading white space. */
+
+ while (isspace (*args))
+ args++;
+
+ if (args[0] == '\0')
+ return NULL; /* No more arguments. */
+
+ /* Find the end of the current argument. */
+
+ end = args;
+ while (*end != '\0' && !isspace (*end))
+ end++;
+
+ /* Adjust ARGSP to point to the start of the next argument. */
+
+ *argsp = end;
+
+ /* Make a copy of the current argument and return it. */
+
+ result = xmalloc (end - args + 1);
+ strncpy (result, args, end - args);
+ result[end - args] = '\0';
+
+ return result;
}
-/* 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). */
+/* Split the arguments specified in a "catch exception" command.
+ Set EX to the appropriate catchpoint type.
+ Set EXP_STRING to the name of the specific exception if
+ specified by the user. */
-struct value *
-ada_vax_float_print_function (struct type *type)
+static void
+catch_ada_exception_command_split (char *args,
+ enum exception_catchpoint_kind *ex,
+ char **exp_string)
{
- 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");
- }
-}
-\f
+ struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
+ char *exception_name;
- /* Range types */
+ exception_name = ada_get_next_arg (&args);
+ make_cleanup (xfree, exception_name);
-/* Scan STR beginning at position K for a discriminant name, and
- return the value of that discriminant field of DVAL in *PX. If
- PNEW_K is not null, put the position of the character beyond the
- name scanned in *PNEW_K. Return 1 if successful; return 0 and do
- not alter *PX and *PNEW_K if unsuccessful. */
+ /* Check that we do not have any more arguments. Anything else
+ is unexpected. */
-static int
-scan_discrim_bound (char *str, 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;
+ while (isspace (*args))
+ args++;
- if (dval == NULL || str == NULL || str[k] == '\0')
- return 0;
+ if (args[0] != '\0')
+ error (_("Junk at end of expression"));
- pend = strstr (str + k, "__");
- if (pend == NULL)
+ discard_cleanups (old_chain);
+
+ if (exception_name == NULL)
{
- bound = str + k;
- k += strlen (bound);
+ /* Catch all exceptions. */
+ *ex = ex_catch_exception;
+ *exp_string = NULL;
+ }
+ else if (strcmp (exception_name, "unhandled") == 0)
+ {
+ /* Catch unhandled exceptions. */
+ *ex = ex_catch_exception_unhandled;
+ *exp_string = NULL;
}
else
{
- 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;
+ /* Catch a specific exception. */
+ *ex = ex_catch_exception;
+ *exp_string = exception_name;
}
-
- bound_val = ada_search_struct_field (bound, dval, 0, VALUE_TYPE (dval));
- if (bound_val == NULL)
- return 0;
-
- *px = value_as_long (bound_val);
- if (pnew_k != NULL)
- *pnew_k = k;
- return 1;
}
-/* 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. */
+/* Return the name of the symbol on which we should break in order to
+ implement a catchpoint of the EX kind. */
-static struct value *
-get_var_value (char *name, char *err_msg)
+static const char *
+ada_exception_sym_name (enum exception_catchpoint_kind ex)
{
- struct ada_symbol_info *syms;
- int nsyms;
+ gdb_assert (exception_info != NULL);
- nsyms = ada_lookup_symbol_list (name, get_selected_block (0), VAR_DOMAIN,
- &syms);
-
- if (nsyms != 1)
+ switch (ex)
{
- if (err_msg == NULL)
- return 0;
- else
- error ("%s", err_msg);
+ case ex_catch_exception:
+ return (exception_info->catch_exception_sym);
+ break;
+ case ex_catch_exception_unhandled:
+ return (exception_info->catch_exception_unhandled_sym);
+ break;
+ case ex_catch_assert:
+ return (exception_info->catch_assert_sym);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("unexpected catchpoint kind (%d)"), ex);
}
-
- return value_of_variable (syms[0].sym, syms[0].block);
}
-/* Value of integer variable named NAME in the current environment. If
- no such variable found, returns 0, and sets *FLAG to 0. If
- successful, sets *FLAG to 1. */
+/* Return the breakpoint ops "virtual table" used for catchpoints
+ of the EX kind. */
-LONGEST
-get_int_var_value (char *name, int *flag)
+static struct breakpoint_ops *
+ada_exception_breakpoint_ops (enum exception_catchpoint_kind ex)
{
- struct value *var_val = get_var_value (name, 0);
-
- if (var_val == 0)
- {
- if (flag != NULL)
- *flag = 0;
- return 0;
- }
- else
+ switch (ex)
{
- if (flag != NULL)
- *flag = 1;
- return value_as_long (var_val);
+ case ex_catch_exception:
+ return (&catch_exception_breakpoint_ops);
+ break;
+ case ex_catch_exception_unhandled:
+ return (&catch_exception_unhandled_breakpoint_ops);
+ break;
+ case ex_catch_assert:
+ return (&catch_assert_breakpoint_ops);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("unexpected catchpoint kind (%d)"), ex);
}
}
+/* Return the condition that will be used to match the current exception
+ being raised with the exception that the user wants to catch. This
+ assumes that this condition is used when the inferior just triggered
+ an exception catchpoint.
+
+ The string returned is a newly allocated string that needs to be
+ deallocated later. */
-/* Return a range type whose base type is that of the range type named
- NAME in the current environment, and whose bounds are calculated
- from NAME according to the GNAT range encoding conventions.
- Extract discriminant values, if needed, from DVAL. If a new type
- must be created, allocate in OBJFILE's space. The bounds
- information, in general, is encoded in NAME, the base type given in
- the named range type. */
+static char *
+ada_exception_catchpoint_cond_string (const char *exp_string)
+{
+ return xstrprintf ("long_integer (e) = long_integer (&%s)", exp_string);
+}
-static struct type *
-to_fixed_range_type (char *name, struct value *dval, struct objfile *objfile)
+/* Return the expression corresponding to COND_STRING evaluated at SAL. */
+
+static struct expression *
+ada_parse_catchpoint_condition (char *cond_string,
+ struct symtab_and_line sal)
{
- struct type *raw_type = ada_find_any_type (name);
- struct type *base_type;
- char *subtype_info;
+ return (parse_exp_1 (&cond_string, block_for_pc (sal.pc), 0));
+}
- if (raw_type == NULL)
- base_type = builtin_type_int;
- else if (TYPE_CODE (raw_type) == TYPE_CODE_RANGE)
- base_type = TYPE_TARGET_TYPE (raw_type);
- else
- base_type = raw_type;
+/* Return the symtab_and_line that should be used to insert an exception
+ catchpoint of the TYPE kind.
- subtype_info = strstr (name, "___XD");
- if (subtype_info == NULL)
- return raw_type;
- else
- {
- static char *name_buf = NULL;
- static size_t name_len = 0;
- int prefix_len = subtype_info - name;
- LONGEST L, U;
- struct type *type;
- char *bounds_str;
- int n;
+ EX_STRING should contain the name of a specific exception
+ that the catchpoint should catch, or NULL otherwise.
- GROW_VECT (name_buf, name_len, prefix_len + 5);
- strncpy (name_buf, name, prefix_len);
- name_buf[prefix_len] = '\0';
+ The idea behind all the remaining parameters is that their names match
+ the name of certain fields in the breakpoint structure that are used to
+ handle exception catchpoints. This function returns the value to which
+ these fields should be set, depending on the type of catchpoint we need
+ to create.
+
+ If COND and COND_STRING are both non-NULL, any value they might
+ hold will be free'ed, and then replaced by newly allocated ones.
+ These parameters are left untouched otherwise. */
- subtype_info += 5;
- bounds_str = strchr (subtype_info, '_');
- n = 1;
+static struct symtab_and_line
+ada_exception_sal (enum exception_catchpoint_kind ex, char *exp_string,
+ char **addr_string, char **cond_string,
+ struct expression **cond, struct breakpoint_ops **ops)
+{
+ const char *sym_name;
+ struct symbol *sym;
+ struct symtab_and_line sal;
+
+ /* First, find out which exception support info to use. */
+ ada_exception_support_info_sniffer ();
+
+ /* Then lookup the function on which we will break in order to catch
+ the Ada exceptions requested by the user. */
+
+ sym_name = ada_exception_sym_name (ex);
+ sym = standard_lookup (sym_name, NULL, VAR_DOMAIN);
+
+ /* The symbol we're looking up is provided by a unit in the GNAT runtime
+ that should be compiled with debugging information. As a result, we
+ expect to find that symbol in the symtabs. If we don't find it, then
+ the target most likely does not support Ada exceptions, or we cannot
+ insert exception breakpoints yet, because the GNAT runtime hasn't been
+ loaded yet. */
+
+ /* brobecker/2006-12-26: It is conceivable that the runtime was compiled
+ in such a way that no debugging information is produced for the symbol
+ we are looking for. In this case, we could search the minimal symbols
+ as a fall-back mechanism. This would still be operating in degraded
+ mode, however, as we would still be missing the debugging information
+ that is needed in order to extract the name of the exception being
+ raised (this name is printed in the catchpoint message, and is also
+ used when trying to catch a specific exception). We do not handle
+ this case for now. */
- if (*subtype_info == 'L')
- {
- 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. */
- n += 1;
- subtype_info += 1;
- }
- else
+ if (sym == NULL)
+ error (_("Unable to break on '%s' in this configuration."), sym_name);
+
+ /* Make sure that the symbol we found corresponds to a function. */
+ if (SYMBOL_CLASS (sym) != LOC_BLOCK)
+ error (_("Symbol \"%s\" is not a function (class = %d)"),
+ sym_name, SYMBOL_CLASS (sym));
+
+ sal = find_function_start_sal (sym, 1);
+
+ /* Set ADDR_STRING. */
+
+ *addr_string = xstrdup (sym_name);
+
+ /* Set the COND and COND_STRING (if not NULL). */
+
+ if (cond_string != NULL && cond != NULL)
+ {
+ if (*cond_string != NULL)
{
- int ok;
- strcpy (name_buf + prefix_len, "___L");
- L = get_int_var_value (name_buf, &ok);
- if (!ok)
- {
- lim_warning ("Unknown lower bound, using 1.", 1);
- L = 1;
- }
+ xfree (*cond_string);
+ *cond_string = NULL;
}
-
- if (*subtype_info == 'U')
+ if (*cond != NULL)
{
- if (!ada_scan_number (bounds_str, n, &U, &n)
- && !scan_discrim_bound (bounds_str, n, dval, &U, &n))
- return raw_type;
+ xfree (*cond);
+ *cond = NULL;
}
- else
+ if (exp_string != NULL)
{
- int ok;
- strcpy (name_buf + prefix_len, "___U");
- U = get_int_var_value (name_buf, &ok);
- if (!ok)
- {
- lim_warning ("Unknown upper bound, using %ld.", (long) L);
- U = L;
- }
+ *cond_string = ada_exception_catchpoint_cond_string (exp_string);
+ *cond = ada_parse_catchpoint_condition (*cond_string, sal);
}
-
- if (objfile == NULL)
- objfile = TYPE_OBJFILE (base_type);
- type = create_range_type (alloc_type (objfile), base_type, L, U);
- TYPE_NAME (type) = name;
- return type;
}
-}
-/* True iff NAME is the name of a range type. */
+ /* Set OPS. */
+ *ops = ada_exception_breakpoint_ops (ex);
-int
-ada_is_range_type_name (const char *name)
-{
- return (name != NULL && strstr (name, "___XD"));
+ return sal;
}
-\f
- /* Modular types */
+/* Parse the arguments (ARGS) of the "catch exception" command.
+
+ Set TYPE to the appropriate exception catchpoint type.
+ If the user asked the catchpoint to catch only a specific
+ exception, then save the exception name in ADDR_STRING.
-/* True iff TYPE is an Ada modular type. */
+ See ada_exception_sal for a description of all the remaining
+ function arguments of this function. */
-int
-ada_is_modular_type (struct type *type)
+struct symtab_and_line
+ada_decode_exception_location (char *args, char **addr_string,
+ char **exp_string, char **cond_string,
+ struct expression **cond,
+ struct breakpoint_ops **ops)
{
- struct type *subranged_type = base_type (type);
+ enum exception_catchpoint_kind ex;
- return (subranged_type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
- && TYPE_CODE (subranged_type) != TYPE_CODE_ENUM
- && TYPE_UNSIGNED (subranged_type));
+ catch_ada_exception_command_split (args, &ex, exp_string);
+ return ada_exception_sal (ex, *exp_string, addr_string, cond_string,
+ cond, ops);
}
-/* Assuming ada_is_modular_type (TYPE), the modulus of TYPE. */
-
-LONGEST
-ada_modulus (struct type * type)
+struct symtab_and_line
+ada_decode_assert_location (char *args, char **addr_string,
+ struct breakpoint_ops **ops)
{
- return TYPE_HIGH_BOUND (type) + 1;
+ /* Check that no argument where provided at the end of the command. */
+
+ if (args != NULL)
+ {
+ while (isspace (*args))
+ args++;
+ if (*args != '\0')
+ error (_("Junk at end of arguments."));
+ }
+
+ return ada_exception_sal (ex_catch_assert, NULL, addr_string, NULL, NULL,
+ ops);
}
-\f
+
/* Operators */
/* Information about operators given special treatment in functions
below. */
OP_DEFN (OP_ATR_TAG, 1, 1, 0) \
OP_DEFN (OP_ATR_VAL, 1, 2, 0) \
OP_DEFN (UNOP_QUAL, 3, 1, 0) \
- OP_DEFN (UNOP_IN_RANGE, 3, 1, 0)
+ OP_DEFN (UNOP_IN_RANGE, 3, 1, 0) \
+ OP_DEFN (OP_OTHERS, 1, 1, 0) \
+ OP_DEFN (OP_POSITIONAL, 3, 1, 0) \
+ OP_DEFN (OP_DISCRETE_RANGE, 1, 2, 0)
static void
ada_operator_length (struct expression *exp, int pc, int *oplenp, int *argsp)
{
switch (exp->elts[pc - 1].opcode)
{
- default:
+ default:
operator_length_standard (exp, pc, oplenp, argsp);
break;
case op: *oplenp = len; *argsp = args; break;
ADA_OPERATORS;
#undef OP_DEFN
+
+ case OP_AGGREGATE:
+ *oplenp = 3;
+ *argsp = longest_to_int (exp->elts[pc - 2].longconst);
+ break;
+
+ case OP_CHOICES:
+ *oplenp = 3;
+ *argsp = longest_to_int (exp->elts[pc - 2].longconst) + 1;
+ break;
}
}
{
switch (opcode)
{
- default:
+ default:
return op_name_standard (opcode);
+
#define OP_DEFN(op, len, args, binop) case op: return #op;
ADA_OPERATORS;
#undef OP_DEFN
+
+ case OP_AGGREGATE:
+ return "OP_AGGREGATE";
+ case OP_CHOICES:
+ return "OP_CHOICES";
+ case OP_NAME:
+ return "OP_NAME";
}
}
/* As for operator_length, but assumes PC is pointing at the first
element of the operator, and gives meaningful results only for the
- Ada-specific operators. */
+ Ada-specific operators, returning 0 for *OPLENP and *ARGSP otherwise. */
static void
-ada_forward_operator_length (struct expression *exp, int pc,
- int *oplenp, int *argsp)
+ada_forward_operator_length (struct expression *exp, int pc,
+ int *oplenp, int *argsp)
{
- switch (exp->elts[pc].opcode)
+ switch (exp->elts[pc].opcode)
{
default:
*oplenp = *argsp = 0;
break;
+
#define OP_DEFN(op, len, args, binop) \
case op: *oplenp = len; *argsp = args; break;
ADA_OPERATORS;
#undef OP_DEFN
+
+ case OP_AGGREGATE:
+ *oplenp = 3;
+ *argsp = longest_to_int (exp->elts[pc + 1].longconst);
+ break;
+
+ case OP_CHOICES:
+ *oplenp = 3;
+ *argsp = longest_to_int (exp->elts[pc + 1].longconst) + 1;
+ break;
+
+ case OP_STRING:
+ case OP_NAME:
+ {
+ int len = longest_to_int (exp->elts[pc + 1].longconst);
+ *oplenp = 4 + BYTES_TO_EXP_ELEM (len + 1);
+ *argsp = 0;
+ break;
+ }
}
}
int oplen, nargs;
int pc = elt;
int i;
-
+
ada_forward_operator_length (exp, elt, &oplen, &nargs);
- switch (op)
+ switch (op)
{
- /* Ada attributes ('Foo). */
+ /* Ada attributes ('Foo). */
case OP_ATR_FIRST:
case OP_ATR_LAST:
case OP_ATR_LENGTH:
case UNOP_IN_RANGE:
case UNOP_QUAL:
- fprintf_filtered (stream, "Type @");
+ /* XXX: gdb_sprint_host_address, type_sprint */
+ fprintf_filtered (stream, _("Type @"));
gdb_print_host_address (exp->elts[pc + 1].type, stream);
fprintf_filtered (stream, " (");
type_print (exp->elts[pc + 1].type, NULL, stream, 0);
fprintf_filtered (stream, ")");
break;
case BINOP_IN_BOUNDS:
- fprintf_filtered (stream, " (%d)", (int) exp->elts[pc + 2].longconst);
+ fprintf_filtered (stream, " (%d)",
+ longest_to_int (exp->elts[pc + 2].longconst));
break;
case TERNOP_IN_RANGE:
break;
+ case OP_AGGREGATE:
+ case OP_OTHERS:
+ case OP_DISCRETE_RANGE:
+ case OP_POSITIONAL:
+ case OP_CHOICES:
+ break;
+
+ case OP_NAME:
+ case OP_STRING:
+ {
+ char *name = &exp->elts[elt + 2].string;
+ int len = longest_to_int (exp->elts[elt + 1].longconst);
+ fprintf_filtered (stream, "Text: `%.*s'", len, name);
+ break;
+ }
+
default:
return dump_subexp_body_standard (exp, stream, elt);
}
/* The Ada extension of print_subexp (q.v.). */
-static void
-ada_print_subexp (struct expression *exp, int *pos,
- struct ui_file *stream, enum precedence prec)
+static void
+ada_print_subexp (struct expression *exp, int *pos,
+ struct ui_file *stream, enum precedence prec)
{
- int oplen, nargs;
+ int oplen, nargs, i;
int pc = *pos;
enum exp_opcode op = exp->elts[pc].opcode;
ada_forward_operator_length (exp, pc, &oplen, &nargs);
+ *pos += oplen;
switch (op)
{
default:
+ *pos -= oplen;
print_subexp_standard (exp, pos, stream, prec);
return;
case OP_VAR_VALUE:
- *pos += oplen;
fputs_filtered (SYMBOL_NATURAL_NAME (exp->elts[pc + 2].symbol), stream);
return;
case BINOP_IN_BOUNDS:
- *pos += oplen;
+ /* XXX: sprint_subexp */
print_subexp (exp, pos, stream, PREC_SUFFIX);
fputs_filtered (" in ", stream);
print_subexp (exp, pos, stream, PREC_SUFFIX);
fputs_filtered ("'range", stream);
if (exp->elts[pc + 1].longconst > 1)
- fprintf_filtered (stream, "(%ld)", (long) exp->elts[pc + 1].longconst);
+ fprintf_filtered (stream, "(%ld)",
+ (long) exp->elts[pc + 1].longconst);
return;
case TERNOP_IN_RANGE:
- *pos += oplen;
if (prec >= PREC_EQUAL)
- fputs_filtered ("(", stream);
+ fputs_filtered ("(", stream);
+ /* XXX: sprint_subexp */
print_subexp (exp, pos, stream, PREC_SUFFIX);
fputs_filtered (" in ", stream);
print_subexp (exp, pos, stream, PREC_EQUAL);
fputs_filtered (" .. ", stream);
print_subexp (exp, pos, stream, PREC_EQUAL);
if (prec >= PREC_EQUAL)
- fputs_filtered (")", stream);
- return;
+ fputs_filtered (")", stream);
+ return;
case OP_ATR_FIRST:
case OP_ATR_LAST:
case OP_ATR_SIZE:
case OP_ATR_TAG:
case OP_ATR_VAL:
- *pos += oplen;
if (exp->elts[*pos].opcode == OP_TYPE)
- {
- if (TYPE_CODE (exp->elts[*pos + 1].type) != TYPE_CODE_VOID)
- LA_PRINT_TYPE (exp->elts[*pos + 1].type, "", stream, 0, 0);
- *pos += 3;
- }
+ {
+ if (TYPE_CODE (exp->elts[*pos + 1].type) != TYPE_CODE_VOID)
+ LA_PRINT_TYPE (exp->elts[*pos + 1].type, "", stream, 0, 0);
+ *pos += 3;
+ }
else
- print_subexp (exp, pos, stream, PREC_SUFFIX);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
fprintf_filtered (stream, "'%s", ada_attribute_name (op));
if (nargs > 1)
- {
- int tem;
- for (tem = 1; tem < nargs; tem += 1)
- {
- fputs_filtered ( (tem == 1) ? " (" : ", ", stream);
- print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
- }
- fputs_filtered (")", stream);
- }
+ {
+ int tem;
+ for (tem = 1; tem < nargs; tem += 1)
+ {
+ fputs_filtered ((tem == 1) ? " (" : ", ", stream);
+ print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ }
+ fputs_filtered (")", stream);
+ }
return;
case UNOP_QUAL:
- *pos += oplen;
type_print (exp->elts[pc + 1].type, "", stream, 0);
fputs_filtered ("'(", stream);
print_subexp (exp, pos, stream, PREC_PREFIX);
return;
case UNOP_IN_RANGE:
- *pos += oplen;
+ /* XXX: sprint_subexp */
print_subexp (exp, pos, stream, PREC_SUFFIX);
fputs_filtered (" in ", stream);
LA_PRINT_TYPE (exp->elts[pc + 1].type, "", stream, 1, 0);
return;
+
+ case OP_DISCRETE_RANGE:
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ fputs_filtered ("..", stream);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ return;
+
+ case OP_OTHERS:
+ fputs_filtered ("others => ", stream);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ return;
+
+ case OP_CHOICES:
+ for (i = 0; i < nargs-1; i += 1)
+ {
+ if (i > 0)
+ fputs_filtered ("|", stream);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ }
+ fputs_filtered (" => ", stream);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ return;
+
+ case OP_POSITIONAL:
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ return;
+
+ case OP_AGGREGATE:
+ fputs_filtered ("(", stream);
+ for (i = 0; i < nargs; i += 1)
+ {
+ if (i > 0)
+ fputs_filtered (", ", stream);
+ print_subexp (exp, pos, stream, PREC_SUFFIX);
+ }
+ fputs_filtered (")", stream);
+ return;
}
}
{NULL, 0, 0, 0}
};
\f
- /* 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[]) =
-{
- &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
-};
-
-/* Not really used, but needed in the ada_language_defn. */
-
-static void
-emit_char (int c, struct ui_file *stream, int quoter)
-{
- ada_emit_char (c, stream, quoter, 1);
-}
-
-static int
-parse ()
-{
- warnings_issued = 0;
- return ada_parse ();
-}
-
-static const struct exp_descriptor ada_exp_descriptor =
-{
- ada_print_subexp,
- ada_operator_length,
- ada_op_name,
- ada_dump_subexp_body,
- ada_evaluate_subexp
-};
-
-const struct language_defn ada_language_defn = {
- "ada", /* Language name */
- language_ada,
- ada_builtin_types,
- range_check_off,
- type_check_off,
- case_sensitive_on, /* Yes, Ada is case-insensitive, but
- that's not quite what this means. */
-#ifdef GNAT_GDB
- ada_lookup_symbol,
- ada_lookup_minimal_symbol,
-#endif /* GNAT_GDB */
- &ada_exp_descriptor,
- parse,
- ada_error,
- resolve,
- ada_printchar, /* Print a character constant */
- ada_printstr, /* Function to print string constant */
- emit_char, /* Function to print single char (not used) */
- ada_create_fundamental_type, /* Create fundamental type in this language */
- 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 */
- NULL, /* Language specific skip_trampoline */
- NULL, /* value_of_this */
- ada_lookup_symbol_nonlocal, /* Looking up non-local symbols. */
- basic_lookup_transparent_type,/* lookup_transparent_type */
- ada_la_decode, /* Language specific symbol demangler */
- {"", "", "", ""}, /* Binary format info */
-#if 0
- {"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 */
-#endif
- ada_op_print_tab, /* expression operators for printing */
- 0, /* c-style arrays */
- 1, /* String lower bound */
- &builtin_type_ada_char,
- ada_get_gdb_completer_word_break_characters,
-#ifdef GNAT_GDB
- ada_translate_error_message, /* Substitute Ada-specific terminology
- in errors and warnings. */
-#endif /* GNAT_GDB */
- LANG_MAGIC
-};
-
-static void
-build_ada_types (void) {
- builtin_type_ada_int =
- init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT,
- 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);
- builtin_type_ada_short =
- init_type (TYPE_CODE_INT, TARGET_SHORT_BIT / TARGET_CHAR_BIT,
- 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);
- builtin_type_ada_float =
- init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
- 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);
- builtin_type_ada_long_long =
- init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
- 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);
- builtin_type_ada_natural =
- init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT,
- 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);
-
-
- 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";
-}
-
-void
-_initialize_ada_language (void)
-{
-
- build_ada_types ();
- deprecated_register_gdbarch_swap (NULL, 0, build_ada_types);
- add_language (&ada_language_defn);
-
- varsize_limit = 65536;
-#ifdef GNAT_GDB
- add_show_from_set
- (add_set_cmd ("varsize-limit", class_support, var_uinteger,
- (char *) &varsize_limit,
- "Set maximum bytes in dynamic-sized object.",
- &setlist), &showlist);
- obstack_init (&cache_space);
-#endif /* GNAT_GDB */
-
- obstack_init (&symbol_list_obstack);
-
- decoded_names_store = htab_create_alloc_ex
- (256, htab_hash_string, (int (*) (const void *, const void *)) streq,
- NULL, NULL, xmcalloc, xmfree);
-}
+ /* Fundamental Ada Types */
/* Create a fundamental Ada type using default reasonable for the current
target machine.
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,
+ gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
0, "<?type?>", objfile);
- warning ("internal error: no Ada fundamental type %d", typeid);
+ warning (_("internal error: no Ada fundamental type %d"), typeid);
break;
case FT_VOID:
type = init_type (TYPE_CODE_VOID,
break;
case FT_SHORT:
type = init_type (TYPE_CODE_INT,
- TARGET_SHORT_BIT / TARGET_CHAR_BIT,
+ gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
0, "short_integer", objfile);
break;
case FT_SIGNED_SHORT:
type = init_type (TYPE_CODE_INT,
- TARGET_SHORT_BIT / TARGET_CHAR_BIT,
+ gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
0, "short_integer", objfile);
break;
case FT_UNSIGNED_SHORT:
type = init_type (TYPE_CODE_INT,
- TARGET_SHORT_BIT / TARGET_CHAR_BIT,
+ gdbarch_short_bit (current_gdbarch) / 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,
+ gdbarch_int_bit (current_gdbarch) / 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 */
+ type = init_type (TYPE_CODE_INT,
+ gdbarch_int_bit (current_gdbarch) / 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,
+ gdbarch_int_bit (current_gdbarch) / 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,
+ gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
0, "long_integer", objfile);
break;
case FT_SIGNED_LONG:
type = init_type (TYPE_CODE_INT,
- TARGET_LONG_BIT / TARGET_CHAR_BIT,
+ gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
0, "long_integer", objfile);
break;
case FT_UNSIGNED_LONG:
type = init_type (TYPE_CODE_INT,
- TARGET_LONG_BIT / TARGET_CHAR_BIT,
+ gdbarch_long_bit (current_gdbarch) / 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);
+ gdbarch_long_long_bit (current_gdbarch)
+ / 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);
+ gdbarch_long_long_bit (current_gdbarch)
+ / 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);
+ gdbarch_long_long_bit (current_gdbarch)
+ / TARGET_CHAR_BIT,
+ TYPE_FLAG_UNSIGNED, "unsigned long long", objfile);
break;
case FT_FLOAT:
type = init_type (TYPE_CODE_FLT,
return (type);
}
+enum ada_primitive_types {
+ ada_primitive_type_int,
+ ada_primitive_type_long,
+ ada_primitive_type_short,
+ ada_primitive_type_char,
+ ada_primitive_type_float,
+ ada_primitive_type_double,
+ ada_primitive_type_void,
+ ada_primitive_type_long_long,
+ ada_primitive_type_long_double,
+ ada_primitive_type_natural,
+ ada_primitive_type_positive,
+ ada_primitive_type_system_address,
+ nr_ada_primitive_types
+};
+
+static void
+ada_language_arch_info (struct gdbarch *current_gdbarch,
+ struct language_arch_info *lai)
+{
+ const struct builtin_type *builtin = builtin_type (current_gdbarch);
+ lai->primitive_type_vector
+ = GDBARCH_OBSTACK_CALLOC (current_gdbarch, nr_ada_primitive_types + 1,
+ struct type *);
+ lai->primitive_type_vector [ada_primitive_type_int] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "integer", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_long] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "long_integer", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_short] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "short_integer", (struct objfile *) NULL);
+ lai->string_char_type =
+ lai->primitive_type_vector [ada_primitive_type_char] =
+ init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
+ 0, "character", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_float] =
+ init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
+ 0, "float", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_double] =
+ init_type (TYPE_CODE_FLT, TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
+ 0, "long_float", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_long_long] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_long_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "long_long_integer", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_long_double] =
+ init_type (TYPE_CODE_FLT, TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT,
+ 0, "long_long_float", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_natural] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "natural", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_positive] =
+ init_type (TYPE_CODE_INT,
+ gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
+ 0, "positive", (struct objfile *) NULL);
+ lai->primitive_type_vector [ada_primitive_type_void] = builtin->builtin_void;
+
+ lai->primitive_type_vector [ada_primitive_type_system_address] =
+ lookup_pointer_type (init_type (TYPE_CODE_VOID, 1, 0, "void",
+ (struct objfile *) NULL));
+ TYPE_NAME (lai->primitive_type_vector [ada_primitive_type_system_address])
+ = "system__address";
+}
+\f
+ /* Language vector */
+
+/* Not really used, but needed in the ada_language_defn. */
+
+static void
+emit_char (int c, struct ui_file *stream, int quoter)
+{
+ ada_emit_char (c, stream, quoter, 1);
+}
+
+static int
+parse (void)
+{
+ warnings_issued = 0;
+ return ada_parse ();
+}
+
+static const struct exp_descriptor ada_exp_descriptor = {
+ ada_print_subexp,
+ ada_operator_length,
+ ada_op_name,
+ ada_dump_subexp_body,
+ ada_evaluate_subexp
+};
+
+const struct language_defn ada_language_defn = {
+ "ada", /* Language name */
+ language_ada,
+ NULL,
+ range_check_off,
+ type_check_off,
+ case_sensitive_on, /* Yes, Ada is case-insensitive, but
+ that's not quite what this means. */
+ array_row_major,
+ &ada_exp_descriptor,
+ parse,
+ ada_error,
+ resolve,
+ ada_printchar, /* Print a character constant */
+ ada_printstr, /* Function to print string constant */
+ emit_char, /* Function to print single char (not used) */
+ ada_create_fundamental_type, /* Create fundamental type in this language */
+ 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 */
+ NULL, /* Language specific skip_trampoline */
+ NULL, /* value_of_this */
+ ada_lookup_symbol_nonlocal, /* Looking up non-local symbols. */
+ basic_lookup_transparent_type, /* lookup_transparent_type */
+ ada_la_decode, /* Language specific symbol demangler */
+ NULL, /* Language specific class_name_from_physname */
+ ada_op_print_tab, /* expression operators for printing */
+ 0, /* c-style arrays */
+ 1, /* String lower bound */
+ NULL,
+ ada_get_gdb_completer_word_break_characters,
+ ada_language_arch_info,
+ ada_print_array_index,
+ LANG_MAGIC
+};
+
void
-ada_dump_symtab (struct symtab *s)
+_initialize_ada_language (void)
{
- int i;
- fprintf (stderr, "New symtab: [\n");
- 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;
- fprintf (stderr, " %4ld: %8lx\n", (long) e->line, (long) e->pc);
- }
- }
- fprintf (stderr, "]\n");
+ add_language (&ada_language_defn);
+
+ varsize_limit = 65536;
+
+ obstack_init (&symbol_list_obstack);
+
+ decoded_names_store = htab_create_alloc
+ (256, htab_hash_string, (int (*)(const void *, const void *)) streq,
+ NULL, xcalloc, xfree);
}
projects / deliverable / binutils-gdb.git / blobdiff