/* Support for printing Ada values for GDB, the GNU debugger.
- Copyright (C) 1986-2017 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
index_type = TYPE_TARGET_TYPE (index_type);
}
+ /* Don't print the lower bound if it's the default one. */
switch (TYPE_CODE (index_type))
{
case TYPE_CODE_BOOL:
+ case TYPE_CODE_CHAR:
if (low_bound == 0)
return 0;
break;
{
LONGEST high;
+ struct type *base_index_type;
if (get_discrete_bounds (index_type, &low, &high) < 0)
len = 1;
else
len = high - low + 1;
+
+ if (TYPE_CODE (index_type) == TYPE_CODE_RANGE)
+ base_index_type = TYPE_TARGET_TYPE (index_type);
+ else
+ base_index_type = index_type;
+
+ if (TYPE_CODE (base_index_type) == TYPE_CODE_ENUM)
+ {
+ LONGEST low_pos, high_pos;
+
+ /* Non-contiguous enumerations types can by used as index types
+ so the array length is computed from the positions of the
+ first and last literal in the enumeration type, and not from
+ the values of these literals. */
+
+ if (!discrete_position (base_index_type, low, &low_pos)
+ || !discrete_position (base_index_type, high, &high_pos))
+ {
+ warning (_("unable to get positions in array, use bounds instead"));
+ low_pos = low;
+ high_pos = high;
+ }
+
+ /* The array length should normally be HIGH_POS - LOW_POS + 1.
+ But in Ada we allow LOW_POS to be greater than HIGH_POS for
+ empty arrays. In that situation, the array length is just zero,
+ not negative! */
+
+ if (low_pos > high_pos)
+ len = 0;
+ else
+ len = high_pos - low_pos + 1;
+ }
}
i = 0;
default:
error (_("Invalid type code in symbol table."));
}
- gdb_flush (stream);
}
/* Print the character string STRING, printing at most LENGTH characters.
int offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
struct value *mark = value_mark ();
struct value *val;
else
val_print (value_type (val),
value_embedded_offset (val), value_address (val),
- stream, recurse, val, options, language);
+ stream, recurse, val, options,
+ language_def (language_ada));
value_free_to_mark (mark);
}
int offset, int offset_aligned, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
val_print (type, offset, address, stream, recurse,
original_value, options, language_def (language_c));
int offset, int offset_aligned, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
if (ada_is_fixed_point_type (type))
{
val_print (target_type,
value_embedded_offset (v), 0, stream,
- recurse + 1, v, options, language);
+ recurse + 1, v, options,
+ language_def (language_ada));
}
else
val_print (TYPE_TARGET_TYPE (type), offset,
address, stream, recurse, original_value,
- options, language);
+ options, language_def (language_ada));
return;
}
else
int offset, int offset_aligned, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
int i;
unsigned int len;
int offset, int offset_aligned, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
if (options->format)
{
(struct type *type, const gdb_byte *valaddr, int offset,
int offset_aligned, CORE_ADDR address, struct ui_file *stream,
int recurse, struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
if (ada_is_bogus_array_descriptor (type))
{
if (print_field_values (type, valaddr, offset_aligned,
stream, recurse, original_value, options,
- 0, type, offset_aligned, language) != 0
+ 0, type, offset_aligned,
+ language_def (language_ada)) != 0
&& options->prettyformat)
{
fprintf_filtered (stream, "\n");
int offset, int offset_aligned, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
/* For references, the debugger is expected to print the value as
an address if DEREF_REF is null. But printing an address in place
deref_val = ada_tag_value_at_base_address (deref_val);
common_val_print (deref_val, stream, recurse + 1, options,
- language);
+ language_def (language_ada));
return;
}
val_print (value_type (deref_val),
value_embedded_offset (deref_val),
value_address (deref_val), stream, recurse + 1,
- deref_val, options, language);
+ deref_val, options, language_def (language_ada));
}
/* See the comment on ada_val_print. This function differs in that it
int offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct value *original_value,
- const struct value_print_options *options,
- const struct language_defn *language)
+ const struct value_print_options *options)
{
int offset_aligned;
const gdb_byte *valaddr = value_contents_for_printing (original_value);
{
ada_val_print_gnat_array (type, valaddr, offset, address,
stream, recurse, original_value,
- options, language);
+ options);
return;
}
case TYPE_CODE_PTR:
ada_val_print_ptr (type, valaddr, offset, offset_aligned,
address, stream, recurse, original_value,
- options, language);
+ options);
break;
case TYPE_CODE_INT:
case TYPE_CODE_RANGE:
ada_val_print_num (type, valaddr, offset, offset_aligned,
address, stream, recurse, original_value,
- options, language);
+ options);
break;
case TYPE_CODE_ENUM:
ada_val_print_enum (type, valaddr, offset, offset_aligned,
address, stream, recurse, original_value,
- options, language);
+ options);
break;
case TYPE_CODE_FLT:
ada_val_print_flt (type, valaddr, offset, offset_aligned,
address, stream, recurse, original_value,
- options, language);
+ options);
break;
case TYPE_CODE_UNION:
case TYPE_CODE_STRUCT:
ada_val_print_struct_union (type, valaddr, offset, offset_aligned,
address, stream, recurse,
- original_value, options, language);
+ original_value, options);
break;
case TYPE_CODE_ARRAY:
case TYPE_CODE_REF:
ada_val_print_ref (type, valaddr, offset, offset_aligned,
address, stream, recurse, original_value,
- options, language);
+ options);
break;
}
}
struct value *val,
const struct value_print_options *options)
{
-
- /* XXX: this catches QUIT/ctrl-c as well. Isn't that busted? */
- TRY
+ try
{
ada_val_print_1 (type, embedded_offset, address,
- stream, recurse, val, options,
- current_language);
+ stream, recurse, val, options);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception_error &except)
{
+ fprintf_filtered (stream, _("<error reading variable: %s>"),
+ except.what ());
}
- END_CATCH
}
void
{
struct value *val = ada_to_fixed_value (val0);
CORE_ADDR address = value_address (val);
- struct type *type = ada_check_typedef (value_enclosing_type (val));
+ struct type *type = ada_check_typedef (value_type (val));
struct value_print_options opts;
/* If it is a pointer, indicate what it points to. */
projects / deliverable / binutils-gdb.git / blobdiff