/* Support for printing Ada values for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1997, 2001,
- 2002, 2003, 2004.
- Free Software Foundation, Inc.
+
+ Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1997, 2001,
+ 2002, 2003, 2004, 2005, 2006 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. */
+Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <ctype.h>
#include "defs.h"
struct ada_val_print_args
{
struct type *type;
- char *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 *, char *, struct ui_file *, int,
- int, enum val_prettyprint);
-
-static int print_field_values (struct type *, char *, struct ui_file *,
- int, int, enum val_prettyprint,
- int, struct type *, char *);
+static void print_record (struct type *, const gdb_byte *, struct ui_file *,
+ int, int, enum val_prettyprint);
-static int print_variant_part (struct type *, int, char *,
+static int print_field_values (struct type *, const gdb_byte *,
struct ui_file *, int, int,
enum val_prettyprint, int, struct type *,
- char *);
-
-static void val_print_packed_array_elements (struct type *, char *valaddr,
- int, struct ui_file *, int, int,
- enum val_prettyprint);
+ 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 *, char *, 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);
-static void ada_print_floating (char *, struct type *, struct ui_file *);
\f
/* Make TYPE unsigned if its range of values includes no negatives. */
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, char *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,
(i * bitsize) / HOST_CHAR_BIT,
(i * bitsize) % HOST_CHAR_BIT,
bitsize, elttype);
- if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen) != 0)
+ if (memcmp (value_contents (v0), value_contents (v1), eltlen) != 0)
break;
}
if (i - i0 > repeat_count_threshold)
{
- val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format,
+ val_print (elttype, value_contents (v0), 0, 0, stream, format,
0, recurse + 1, pretty);
annotate_elt_rep (i - i0);
fprintf_filtered (stream, _(" <repeats %u times>"), i - i0);
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,
+ val_print (elttype, value_contents (v0), 0, 0, stream, format,
0, recurse + 1, pretty);
annotate_elt ();
}
}
static struct type *
-printable_val_type (struct type *type, char *valaddr)
+printable_val_type (struct type *type, const gdb_byte *valaddr)
{
return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
}
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 (char *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 (char *valaddr, struct type *type, struct ui_file *stream)
+ada_print_floating (const gdb_byte *valaddr, struct type *type,
+ struct ui_file *stream)
{
char buffer[64];
char *s, *result;
*/
static void
-printstr (struct ui_file *stream, char *string, unsigned int length,
- int force_ellipses, int type_len)
+printstr (struct ui_file *stream, const gdb_byte *string,
+ unsigned int length, int force_ellipses, int type_len)
{
unsigned int i;
unsigned int things_printed = 0;
}
void
-ada_printstr (struct ui_file *stream, char *string, unsigned int length,
- int width, int force_ellipses)
+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, char *valaddr0, int embedded_offset,
- CORE_ADDR address, struct ui_file *stream, int format,
- int deref_ref, int recurse, enum val_prettyprint pretty)
+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)
{
struct ada_val_print_args args;
args.type = type;
* does not catch evaluation errors (leaving that to ada_val_print). */
static int
-ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
- CORE_ADDR address, struct ui_file *stream, int format,
+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)
{
unsigned int len;
struct type *elttype;
unsigned int eltlen;
LONGEST val;
- char *valaddr = valaddr0 + embedded_offset;
+ const gdb_byte *valaddr = valaddr0 + embedded_offset;
type = ada_check_typedef (type);
retn = 0;
}
else
- retn = ada_val_print_1 (value_type (val), VALUE_CONTENTS (val), 0,
+ retn = ada_val_print_1 (value_type (val), value_contents (val), 0,
VALUE_ADDRESS (val), stream, format,
deref_ref, recurse, pretty);
value_free_to_mark (mark);
call_function_by_hand (func, 1,
&val)));
- fprintf_filtered (stream, "%s", VALUE_CONTENTS (printable_val));
+ fprintf_filtered (stream, "%s", value_contents (printable_val));
return 0;
}
/* No special printing function. Do as best we can. */
struct value *v = value_cast (target_type,
value_from_contents_and_address
(type, valaddr, 0));
- return ada_val_print_1 (target_type, VALUE_CONTENTS (v), 0, 0,
+ return ada_val_print_1 (target_type, value_contents (v), 0, 0,
stream, format, 0, recurse + 1, pretty);
}
else
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,
(lookup_pointer_type (elttype),
deref_val_int));
val_print (value_type (deref_val),
- VALUE_CONTENTS (deref_val), 0,
+ value_contents (deref_val), 0,
VALUE_ADDRESS (deref_val), stream, format,
deref_ref, recurse + 1, pretty);
}
}
static int
-print_variant_part (struct type *type, int field_num, char *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, char *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)
{
- char *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);
return 0;
}
- return (val_print (type, VALUE_CONTENTS (val), 0, address,
+ return (val_print (type, value_contents (val), 0, address,
stream, format, 1, 0, pretty));
}
static void
-print_record (struct type *type, char *valaddr, struct ui_file *stream,
- int format, int recurse, enum val_prettyprint pretty)
+print_record (struct type *type, const gdb_byte *valaddr,
+ struct ui_file *stream, int format, int recurse,
+ enum val_prettyprint pretty)
{
type = ada_check_typedef (type);
Returns 1 if COMMA_NEEDED or any fields were printed. */
static int
-print_field_values (struct type *type, char *valaddr, struct ui_file *stream,
- int format, int recurse, enum val_prettyprint pretty,
- int comma_needed, struct type *outer_type,
- char *outer_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 gdb_byte *outer_valaddr)
{
int i, len;
bit_pos % HOST_CHAR_BIT,
bit_size,
TYPE_FIELD_TYPE (type, i));
- val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
+ val_print (TYPE_FIELD_TYPE (type, i), value_contents (v), 0, 0,
stream, format, 0, recurse + 1, pretty);
}
}