/* Support for printing Ada values for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1997, 2001,
- 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1997, 2001, 2002,
+ 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This file is part of GDB.
+ This file is part of GDB.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-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. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <ctype.h>
#include "defs.h"
struct ada_val_print_args
{
struct type *type;
- const bfd_byte *valaddr0;
+ const gdb_byte *valaddr0;
int embedded_offset;
CORE_ADDR address;
struct ui_file *stream;
enum val_prettyprint pretty;
};
-static void print_record (struct type *, const bfd_byte *, struct ui_file *,
+static void print_record (struct type *, const gdb_byte *, struct ui_file *,
int, int, enum val_prettyprint);
-static int print_field_values (struct type *, const bfd_byte *,
+static int print_field_values (struct type *, const gdb_byte *,
struct ui_file *, int, int,
enum val_prettyprint, int, struct type *,
- const bfd_byte *);
+ const gdb_byte *);
static void adjust_type_signedness (struct type *);
static int ada_val_print_stub (void *args0);
-static int ada_val_print_1 (struct type *, const bfd_byte *, int, CORE_ADDR,
+static int ada_val_print_1 (struct type *, const gdb_byte *, int, CORE_ADDR,
struct ui_file *, int, int, int,
enum val_prettyprint);
\f
struct type *index_type;
long low_bound;
- index_type = TYPE_INDEX_TYPE (type);
- low_bound = 0;
+ if (print_array_indexes_p ())
+ return 0;
- if (index_type == NULL)
+ if (!get_array_low_bound (type, &low_bound))
return 0;
+
+ index_type = TYPE_INDEX_TYPE (type);
+
if (TYPE_CODE (index_type) == TYPE_CODE_RANGE)
{
- low_bound = TYPE_LOW_BOUND (index_type);
- if (low_bound > TYPE_HIGH_BOUND (index_type))
- return 0;
+ /* We need to know what the base type is, in order to do the
+ appropriate check below. Otherwise, if this is a subrange
+ of an enumerated type, where the underlying value of the
+ first element is typically 0, we might test the low bound
+ against the wrong value. */
index_type = TYPE_TARGET_TYPE (index_type);
}
- else
- return 0;
switch (TYPE_CODE (index_type))
{
by ada_coerce_to_simple_array). */
static void
-val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
+val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
int bitoffset, struct ui_file *stream,
int format, int recurse,
enum val_prettyprint pretty)
unsigned int i;
unsigned int things_printed = 0;
unsigned len;
- struct type *elttype;
+ struct type *elttype, *index_type;
unsigned eltlen;
unsigned long bitsize = TYPE_FIELD_BITSIZE (type, 0);
struct value *mark = value_mark ();
+ LONGEST low = 0;
elttype = TYPE_TARGET_TYPE (type);
eltlen = TYPE_LENGTH (check_typedef (elttype));
+ index_type = TYPE_INDEX_TYPE (type);
{
- LONGEST low, high;
+ LONGEST high;
if (get_discrete_bounds (TYPE_FIELD_TYPE (type, 0), &low, &high) < 0)
len = 1;
else
}
}
wrap_here (n_spaces (2 + 2 * recurse));
+ maybe_print_array_index (index_type, i + low, stream, format, pretty);
i0 = i;
v0 = ada_value_primitive_packed_val (NULL, valaddr,
fprintf_filtered (stream, ", ");
}
wrap_here (n_spaces (2 + 2 * recurse));
+ maybe_print_array_index (index_type, j + low,
+ stream, format, pretty);
}
val_print (elttype, value_contents (v0), 0, 0, stream, format,
0, recurse + 1, pretty);
}
static struct type *
-printable_val_type (struct type *type, const bfd_byte *valaddr)
+printable_val_type (struct type *type, const gdb_byte *valaddr)
{
- return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
+ return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL, 1);
}
/* Print the character C on STREAM as part of the contents of a literal
if (isascii (c) && isprint (c))
{
if (c == quoter && c == '"')
- fprintf_filtered (stream, "[\"%c\"]", quoter);
+ fprintf_filtered (stream, "\"\"");
else
fprintf_filtered (stream, "%c", c);
}
or 2) of a character. */
static int
-char_at (const bfd_byte *string, int i, int type_len)
+char_at (const gdb_byte *string, int i, int type_len)
{
if (type_len == 1)
return string[i];
a decimal point, and at least one digit before and after the
point. We use GNAT format for NaNs and infinities. */
static void
-ada_print_floating (const bfd_byte *valaddr, struct type *type,
+ada_print_floating (const gdb_byte *valaddr, struct type *type,
struct ui_file *stream)
{
char buffer[64];
case TYPE_CODE_SET:
case TYPE_CODE_STRING:
case TYPE_CODE_ERROR:
- case TYPE_CODE_MEMBER:
+ case TYPE_CODE_MEMBERPTR:
+ case TYPE_CODE_METHODPTR:
case TYPE_CODE_METHOD:
case TYPE_CODE_REF:
warning (_("internal error: unhandled type in ada_print_scalar"));
*/
static void
-printstr (struct ui_file *stream, const bfd_byte *string,
+printstr (struct ui_file *stream, const gdb_byte *string,
unsigned int length, int force_ellipses, int type_len)
{
unsigned int i;
}
void
-ada_printstr (struct ui_file *stream, const bfd_byte *string,
+ada_printstr (struct ui_file *stream, const gdb_byte *string,
unsigned int length, int width, int force_ellipses)
{
printstr (stream, string, length, force_ellipses, width);
arrays.) */
int
-ada_val_print (struct type *type, const bfd_byte *valaddr0,
+ada_val_print (struct type *type, const gdb_byte *valaddr0,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int format, int deref_ref,
int recurse, enum val_prettyprint pretty)
* does not catch evaluation errors (leaving that to ada_val_print). */
static int
-ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
+ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int format,
int deref_ref, int recurse, enum val_prettyprint pretty)
struct type *elttype;
unsigned int eltlen;
LONGEST val;
- const bfd_byte *valaddr = valaddr0 + embedded_offset;
+ const gdb_byte *valaddr = valaddr0 + embedded_offset;
type = ada_check_typedef (type);
fprintf_filtered (stream, "(");
type_print (type, "", stream, -1);
fprintf_filtered (stream, ") ");
- print_address_numeric
+ deprecated_print_address_numeric
(extract_typed_address (valaddr, builtin_type_void_data_ptr),
1, stream);
}
}
break;
+ case TYPE_CODE_FLAGS:
+ if (format)
+ print_scalar_formatted (valaddr, type, format, 0, stream);
+ else
+ val_print_type_code_flags (type, valaddr, stream);
+ break;
+
case TYPE_CODE_FLT:
if (format)
return c_val_print (type, valaddr0, embedded_offset, address, stream,
return len;
case TYPE_CODE_REF:
+ /* For references, the debugger is expected to print the value as
+ an address if DEREF_REF is null. But printing an address in place
+ of the object value would be confusing to an Ada programmer.
+ So, for Ada values, we print the actual dereferenced value
+ regardless. */
elttype = check_typedef (TYPE_TARGET_TYPE (type));
- /* De-reference the reference */
- if (deref_ref)
- {
- if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
- {
- LONGEST deref_val_int = (LONGEST)
- unpack_pointer (lookup_pointer_type (builtin_type_void),
- valaddr);
- if (deref_val_int != 0)
- {
- struct value *deref_val =
- ada_value_ind (value_from_longest
- (lookup_pointer_type (elttype),
- deref_val_int));
- val_print (value_type (deref_val),
- value_contents (deref_val), 0,
- VALUE_ADDRESS (deref_val), stream, format,
- deref_ref, recurse + 1, pretty);
- }
- else
- fputs_filtered ("(null)", stream);
- }
- else
- fputs_filtered ("???", stream);
- }
+
+ if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
+ {
+ LONGEST deref_val_int = (LONGEST)
+ unpack_pointer (lookup_pointer_type (builtin_type_void),
+ valaddr);
+ if (deref_val_int != 0)
+ {
+ struct value *deref_val =
+ ada_value_ind (value_from_longest
+ (lookup_pointer_type (elttype),
+ deref_val_int));
+ val_print (value_type (deref_val),
+ value_contents (deref_val), 0,
+ VALUE_ADDRESS (deref_val), stream, format,
+ deref_ref, recurse + 1, pretty);
+ }
+ else
+ fputs_filtered ("(null)", stream);
+ }
+ else
+ fputs_filtered ("???", stream);
+
break;
}
gdb_flush (stream);
}
static int
-print_variant_part (struct type *type, int field_num, const bfd_byte *valaddr,
+print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr,
struct ui_file *stream, int format, int recurse,
enum val_prettyprint pretty, int comma_needed,
- struct type *outer_type, const bfd_byte *outer_valaddr)
+ struct type *outer_type, const gdb_byte *outer_valaddr)
{
struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr);
ada_value_print (struct value *val0, struct ui_file *stream, int format,
enum val_prettyprint pretty)
{
- const bfd_byte *valaddr = value_contents (val0);
+ const gdb_byte *valaddr = value_contents (val0);
CORE_ADDR address = VALUE_ADDRESS (val0) + value_offset (val0);
struct type *type =
- ada_to_fixed_type (value_type (val0), valaddr, address, NULL);
+ ada_to_fixed_type (value_type (val0), valaddr, address, NULL, 1);
struct value *val =
value_from_contents_and_address (type, valaddr, address);
}
static void
-print_record (struct type *type, const bfd_byte *valaddr,
+print_record (struct type *type, const gdb_byte *valaddr,
struct ui_file *stream, int format, int recurse,
enum val_prettyprint pretty)
{
Returns 1 if COMMA_NEEDED or any fields were printed. */
static int
-print_field_values (struct type *type, const bfd_byte *valaddr,
+print_field_values (struct type *type, const gdb_byte *valaddr,
struct ui_file *stream, int format, int recurse,
enum val_prettyprint pretty, int comma_needed,
- struct type *outer_type, const bfd_byte *outer_valaddr)
+ struct type *outer_type, const gdb_byte *outer_valaddr)
{
int i, len;