#include "annotate.h"
#include "ada-lang.h"
#include "c-lang.h"
+#include "infcall.h"
/* Encapsulates arguments to ada_val_print. */
-struct ada_val_print_args {
- struct type* type;
- char* valaddr0;
+struct ada_val_print_args
+{
+ struct type *type;
+ char *valaddr0;
int embedded_offset;
CORE_ADDR address;
struct ui_file *stream;
enum val_prettyprint pretty;
};
-extern int inspect_it;
-extern unsigned int repeat_count_threshold;
-
-static void print_record (struct type*, char*, struct ui_file*, int,
+static void print_record (struct type *, char *, struct ui_file *, int,
int, enum val_prettyprint);
-static int print_field_values (struct type*, char*, struct ui_file*,
+static int print_field_values (struct type *, char *, struct ui_file *,
int, int, enum val_prettyprint,
- int, struct type*, char*);
+ int, struct type *, char *);
-static int print_variant_part (struct type*, int, char*,
- struct ui_file*, int, int, enum val_prettyprint,
- int, struct type*, char*);
+static int print_variant_part (struct type *, int, char *,
+ struct ui_file *, int, int,
+ enum val_prettyprint, int, struct type *,
+ char *);
-static void val_print_packed_array_elements (struct type*, char *valaddr, int,
- struct ui_file*, int, int,
+static void val_print_packed_array_elements (struct type *, char *valaddr,
+ int, struct ui_file *, int, int,
enum val_prettyprint);
-static void adjust_type_signedness (struct type*);
+static void adjust_type_signedness (struct type *);
-static int ada_val_print_stub (PTR args0);
+static int ada_val_print_stub (void *args0);
-static int ada_val_print_1 (struct type*, char*, int, CORE_ADDR, struct ui_file*,
- int, int, int, enum val_prettyprint);
+static int ada_val_print_1 (struct type *, char *, int, CORE_ADDR,
+ struct ui_file *, int, int, int,
+ enum val_prettyprint);
\f
/* Make TYPE unsigned if its range of values includes no negatives. */
-static void
-adjust_type_signedness (type)
- struct type* type;
+static void
+adjust_type_signedness (struct type *type)
{
- if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
+ if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
&& TYPE_LOW_BOUND (type) >= 0)
TYPE_FLAGS (type) |= TYPE_FLAG_UNSIGNED;
-}
+}
/* Assuming TYPE is a simple array type, prints its lower bound on STREAM,
if non-standard (i.e., other than 1 for numbers, other than lower bound
of index type for enumerated type). Returns 1 if something printed,
otherwise 0. */
-static int
+static int
print_optional_low_bound (struct ui_file *stream, struct type *type)
{
struct type *index_type;
if (index_type == NULL)
return 0;
- if (TYPE_CODE (index_type) == TYPE_CODE_RANGE)
+ if (TYPE_CODE (index_type) == TYPE_CODE_RANGE)
{
low_bound = TYPE_LOW_BOUND (index_type);
index_type = TYPE_TARGET_TYPE (index_type);
}
else
return 0;
-
- switch (TYPE_CODE (index_type)) {
- case TYPE_CODE_ENUM:
- if (low_bound == TYPE_FIELD_BITPOS (index_type, 0))
- return 0;
- break;
- case TYPE_CODE_UNDEF:
- index_type = builtin_type_long;
- /* FALL THROUGH */
- default:
- if (low_bound == 1)
- return 0;
- break;
- }
+
+ switch (TYPE_CODE (index_type))
+ {
+ case TYPE_CODE_ENUM:
+ if (low_bound == TYPE_FIELD_BITPOS (index_type, 0))
+ return 0;
+ break;
+ case TYPE_CODE_UNDEF:
+ index_type = builtin_type_long;
+ /* FALL THROUGH */
+ default:
+ if (low_bound == 1)
+ return 0;
+ break;
+ }
ada_print_scalar (index_type, (LONGEST) low_bound, stream);
fprintf_filtered (stream, " => ");
BITOFFSET from VALADDR on STREAM. Formats according to FORMAT and
separates with commas. RECURSE is the recursion (nesting) level.
If PRETTY, uses "prettier" format. TYPE must have been decoded (as
- by ada_coerce_to_simple_array). */
+ by ada_coerce_to_simple_array). */
static void
val_print_packed_array_elements (struct type *type, char *valaddr,
/* Number of repetitions we have detected so far. */
unsigned int reps;
unsigned long bitsize = TYPE_FIELD_BITSIZE (type, 0);
- struct value* mark = value_mark ();
-
+ struct value *mark = value_mark ();
+
elttype = TYPE_TARGET_TYPE (type);
eltlen = TYPE_LENGTH (check_typedef (elttype));
wrap_here (n_spaces (2 + 2 * recurse));
i0 = i;
- v0 = ada_value_primitive_packed_val (NULL, valaddr,
+ v0 = ada_value_primitive_packed_val (NULL, valaddr,
(i0 * bitsize) / HOST_CHAR_BIT,
(i0 * bitsize) % HOST_CHAR_BIT,
bitsize, elttype);
i += 1;
if (i >= len)
break;
- v1 = ada_value_primitive_packed_val (NULL, valaddr,
+ v1 = ada_value_primitive_packed_val (NULL, valaddr,
(i * bitsize) / HOST_CHAR_BIT,
(i * bitsize) % HOST_CHAR_BIT,
bitsize, elttype);
- if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen)
- != 0)
+ if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen) != 0)
break;
}
int j;
for (j = i0; j < i; j += 1)
{
- if (j > i0)
+ if (j > i0)
{
if (prettyprint_arrays)
{
value_free_to_mark (mark);
}
-static struct type*
-printable_val_type (struct type* type, char* valaddr)
+static struct type *
+printable_val_type (struct type *type, char *valaddr)
{
return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
}
fprintf_filtered (stream, "%c", c);
}
else
- fprintf_filtered (stream, "[\"%0*x\"]", type_len*2, c);
+ fprintf_filtered (stream, "[\"%0*x\"]", type_len * 2, c);
}
/* Character #I of STRING, given that TYPE_LEN is the size in bytes (1
or 2) of a character. */
static int
-char_at (char* string, int i, int type_len)
+char_at (char *string, int i, int type_len)
{
if (type_len == 1)
return string[i];
- else
- return (int) extract_unsigned_integer (string + 2*i, 2);
+ else
+ return (int) extract_unsigned_integer (string + 2 * i, 2);
}
void
for (i = 0; i < length && things_printed < print_max; i += 1)
{
/* Position of the character we are examining
- to see whether it is repeated. */
+ to see whether it is repeated. */
unsigned int rep1;
/* Number of repetitions we have detected so far. */
unsigned int reps;
rep1 = i + 1;
reps = 1;
- while (rep1 < length &&
- char_at(string, rep1, type_len) == char_at (string, i, type_len))
+ while (rep1 < length &&
+ char_at (string, rep1, type_len) == char_at (string, i,
+ type_len))
{
rep1 += 1;
reps += 1;
in_quotes = 0;
}
fputs_filtered ("'", stream);
- ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len);
+ ada_emit_char (char_at (string, i, type_len), stream, '\'',
+ type_len);
fputs_filtered ("'", stream);
fprintf_filtered (stream, " <repeats %u times>", reps);
i = rep1 - 1;
arrays.) */
int
-ada_val_print (struct type* type, char* valaddr0, int embedded_offset,
+ada_val_print (struct type *type, char *valaddr0, int embedded_offset,
CORE_ADDR address, struct ui_file *stream, int format,
int deref_ref, int recurse, enum val_prettyprint pretty)
{
struct ada_val_print_args args;
- args.type = type; args.valaddr0 = valaddr0;
+ args.type = type;
+ args.valaddr0 = valaddr0;
args.embedded_offset = embedded_offset;
args.address = address;
args.stream = stream;
/* Helper for ada_val_print; used as argument to catch_errors to
unmarshal the arguments to ada_val_print_1, which does the work. */
static int
-ada_val_print_stub (PTR args0)
+ada_val_print_stub (void * args0)
{
- struct ada_val_print_args* argsp = (struct ada_val_print_args*) args0;
- return ada_val_print_1 (argsp->type, argsp->valaddr0, argsp->embedded_offset,
- argsp->address, argsp->stream, argsp->format,
- argsp->deref_ref, argsp->recurse,
- argsp->pretty);
+ struct ada_val_print_args *argsp = (struct ada_val_print_args *) args0;
+ return ada_val_print_1 (argsp->type, argsp->valaddr0,
+ argsp->embedded_offset, argsp->address,
+ argsp->stream, argsp->format, argsp->deref_ref,
+ argsp->recurse, argsp->pretty);
}
/* See the comment on ada_val_print. This function differs in that it
* does not catch evaluation errors (leaving that to ada_val_print). */
static int
-ada_val_print_1 (struct type* type, char* valaddr0, int embedded_offset,
+ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
CORE_ADDR address, struct ui_file *stream, int format,
int deref_ref, int recurse, enum val_prettyprint pretty)
{
unsigned int eltlen;
LONGEST val;
CORE_ADDR addr;
- char* valaddr = valaddr0 + embedded_offset;
+ char *valaddr = valaddr0 + embedded_offset;
CHECK_TYPEDEF (type);
if (ada_is_array_descriptor (type) || ada_is_packed_array_type (type))
{
int retn;
- struct value* mark = value_mark ();
- struct value* val;
+ struct value *mark = value_mark ();
+ struct value *val;
val = value_from_contents_and_address (type, valaddr, address);
val = ada_coerce_to_simple_array_ptr (val);
if (val == NULL)
}
else
retn = ada_val_print_1 (VALUE_TYPE (val), VALUE_CONTENTS (val), 0,
- VALUE_ADDRESS (val), stream, format,
+ VALUE_ADDRESS (val), stream, format,
deref_ref, recurse, pretty);
value_free_to_mark (mark);
return retn;
switch (TYPE_CODE (type))
{
default:
- return c_val_print (type, valaddr0, embedded_offset, address, stream,
+ return c_val_print (type, valaddr0, embedded_offset, address, stream,
format, deref_ref, recurse, pretty);
case TYPE_CODE_INT:
}
else if (ada_is_vax_floating_type (type))
{
- struct value* val =
+ struct value *val =
value_from_contents_and_address (type, valaddr, address);
- struct value* func = ada_vax_float_print_function (type);
+ struct value *func = ada_vax_float_print_function (type);
if (func != 0)
{
- static struct type* parray_of_char = NULL;
- struct value* printable_val;
-
- if (parray_of_char == NULL)
- parray_of_char =
- make_pointer_type
- (create_array_type
- (NULL, builtin_type_char,
- create_range_type (NULL, builtin_type_int, 0, 32)),
- NULL);
-
- printable_val =
+ static struct type *parray_of_char = NULL;
+ struct value *printable_val;
+
+ if (parray_of_char == NULL)
+ parray_of_char =
+ make_pointer_type
+ (create_array_type
+ (NULL, builtin_type_char,
+ create_range_type (NULL, builtin_type_int, 0, 32)), NULL);
+
+ printable_val =
value_ind (value_cast (parray_of_char,
- call_function_by_hand (func, 1, &val)));
-
+ call_function_by_hand (func, 1,
+ &val)));
+
fprintf_filtered (stream, "%s", VALUE_CONTENTS (printable_val));
return 0;
}
}
else if (TYPE_CODE (type) == TYPE_CODE_RANGE)
{
- struct type* target_type = TYPE_TARGET_TYPE (type);
+ struct type *target_type = TYPE_TARGET_TYPE (type);
if (TYPE_LENGTH (type) != TYPE_LENGTH (target_type))
{
/* Obscure case of range type that has different length from
- its base type. Perform a conversion, or we will get a
- nonsense value. Actually, we could use the same
- code regardless of lengths; I'm just avoiding a cast. */
- struct value* v =
- value_cast (target_type,
- value_from_contents_and_address (type, valaddr, 0));
+ its base type. Perform a conversion, or we will get a
+ nonsense value. Actually, we could use the same
+ code regardless of lengths; I'm just avoiding a cast. */
+ struct value *v = value_cast (target_type,
+ value_from_contents_and_address
+ (type, valaddr, 0));
return ada_val_print_1 (target_type, VALUE_CONTENTS (v), 0, 0,
stream, format, 0, recurse + 1, pretty);
}
else
- return ada_val_print_1 (TYPE_TARGET_TYPE (type),
+ return ada_val_print_1 (TYPE_TARGET_TYPE (type),
valaddr0, embedded_offset,
- address, stream, format, deref_ref,
+ address, stream, format, deref_ref,
recurse, pretty);
}
- else
+ else
{
format = format ? format : output_format;
if (format)
}
if (i < len)
{
- const char* name = ada_enum_name (TYPE_FIELD_NAME (type, i));
- if (name[0] == '\'')
+ const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
+ if (name[0] == '\'')
fprintf_filtered (stream, "%ld %s", (long) val, name);
else
fputs_filtered (name, stream);
print_longest (stream, 'd', 0, val);
}
break;
-
+
case TYPE_CODE_UNION:
case TYPE_CODE_STRUCT:
if (ada_is_bogus_array_descriptor (type))
{
fprintf_filtered (stream, "(...?)");
return 0;
- }
+ }
else
{
- print_record (type, valaddr, stream, format,
- recurse, pretty);
+ print_record (type, valaddr, stream, format, recurse, pretty);
return 0;
}
elttype = TYPE_TARGET_TYPE (type);
eltlen = TYPE_LENGTH (elttype);
len = TYPE_LENGTH (type) / eltlen;
-
+
/* For an array of chars, print with string syntax. */
- if (ada_is_string_type (type)
- && (format == 0 || format == 's'))
+ if (ada_is_string_type (type) && (format == 0 || format == 's'))
{
if (prettyprint_arrays)
{
print_spaces_filtered (2 + 2 * recurse, stream);
}
/* If requested, look for the first null char and only print
- elements up to it. */
+ elements up to it. */
if (stop_print_at_null)
{
int temp_len;
-
+
/* Look for a NULL char. */
for (temp_len = 0;
temp_len < len && temp_len < print_max
temp_len += 1);
len = temp_len;
}
-
+
printstr (stream, valaddr, len, 0, eltlen);
}
else
len = 0;
fprintf_filtered (stream, "(");
print_optional_low_bound (stream, type);
- if (TYPE_FIELD_BITSIZE (type, 0) > 0)
+ if (TYPE_FIELD_BITSIZE (type, 0) > 0)
val_print_packed_array_elements (type, valaddr, 0, stream,
- format, recurse,
- pretty);
+ format, recurse, pretty);
else
val_print_array_elements (type, valaddr, address, stream,
format, deref_ref, recurse,
case TYPE_CODE_REF:
elttype = check_typedef (TYPE_TARGET_TYPE (type));
if (addressprint)
- {
+ {
fprintf_filtered (stream, "@");
+ /* Extract an address, assume that the address is unsigned. */
print_address_numeric
- (extract_address (valaddr,
- TARGET_PTR_BIT / HOST_CHAR_BIT), 1, stream);
+ (extract_unsigned_integer (valaddr,
+ TARGET_PTR_BIT / HOST_CHAR_BIT),
+ 1, stream);
if (deref_ref)
fputs_filtered (": ", stream);
- }
+ }
/* De-reference the reference */
if (deref_ref)
{
if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
{
- LONGEST deref_val_int = (LONGEST)
- unpack_pointer (lookup_pointer_type (builtin_type_void),
+ LONGEST deref_val_int = (LONGEST)
+ unpack_pointer (lookup_pointer_type (builtin_type_void),
valaddr);
- if (deref_val_int != 0)
+ if (deref_val_int != 0)
{
- struct value* deref_val =
- ada_value_ind (value_from_longest
- (lookup_pointer_type (elttype),
+ struct value *deref_val =
+ ada_value_ind (value_from_longest
+ (lookup_pointer_type (elttype),
deref_val_int));
val_print (VALUE_TYPE (deref_val),
VALUE_CONTENTS (deref_val), 0,
struct type *outer_type, char *outer_valaddr)
{
struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
- int which =
- ada_which_variant_applies (var_type, outer_type, outer_valaddr);
+ int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr);
if (which < 0)
return 0;
else
- return print_field_values
+ return print_field_values
(TYPE_FIELD_TYPE (var_type, which),
valaddr + TYPE_FIELD_BITPOS (type, field_num) / HOST_CHAR_BIT
+ TYPE_FIELD_BITPOS (var_type, which) / HOST_CHAR_BIT,
}
int
-ada_value_print (struct value* val0, struct ui_file *stream, int format,
+ada_value_print (struct value *val0, struct ui_file *stream, int format,
enum val_prettyprint pretty)
{
- char* valaddr = VALUE_CONTENTS (val0);
+ char *valaddr = VALUE_CONTENTS (val0);
CORE_ADDR address = VALUE_ADDRESS (val0) + VALUE_OFFSET (val0);
- struct type* type =
+ struct type *type =
ada_to_fixed_type (VALUE_TYPE (val0), valaddr, address, NULL);
- struct value* val = value_from_contents_and_address (type, valaddr, address);
+ struct value *val =
+ value_from_contents_and_address (type, valaddr, address);
/* If it is a pointer, indicate what it points to. */
- if (TYPE_CODE (type) == TYPE_CODE_PTR ||
- TYPE_CODE (type) == TYPE_CODE_REF)
+ if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_CODE (type) == TYPE_CODE_REF)
{
/* Hack: remove (char *) for char strings. Their
- type is indicated by the quoted string anyway. */
+ type is indicated by the quoted string anyway. */
if (TYPE_CODE (type) == TYPE_CODE_PTR &&
- TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == sizeof(char) &&
+ TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == sizeof (char) &&
TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_INT &&
!TYPE_UNSIGNED (TYPE_TARGET_TYPE (type)))
{
fprintf_filtered (stream, ") ");
}
}
- else if (ada_is_array_descriptor (type))
+ else if (ada_is_array_descriptor (type))
{
fprintf_filtered (stream, "(");
type_print (type, "", stream, -1);
fprintf_filtered (stream, ") (...?)");
return 0;
}
- return (val_print (type, VALUE_CONTENTS (val), 0, address,
+ return (val_print (type, VALUE_CONTENTS (val), 0, address,
stream, format, 1, 0, pretty));
}
-
+
static void
print_record (struct type *type, char *valaddr, struct ui_file *stream,
int format, int recurse, enum val_prettyprint pretty)
fprintf_filtered (stream, "(");
if (print_field_values (type, valaddr, stream, format, recurse, pretty,
- 0, type, valaddr) != 0
- && pretty)
+ 0, type, valaddr) != 0 && pretty)
{
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 * recurse, stream);
for (i = 0; i < len; i += 1)
{
if (ada_is_ignored_field (type, i))
- continue;
+ continue;
if (ada_is_wrapper_field (type, i))
{
- comma_needed =
+ comma_needed =
print_field_values (TYPE_FIELD_TYPE (type, i),
- valaddr
+ valaddr
+ TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
stream, format, recurse, pretty,
comma_needed, type, valaddr);
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 + 2 * recurse, stream);
}
- else
+ else
{
wrap_here (n_spaces (2 + 2 * recurse));
}
else
{
annotate_field_begin (TYPE_FIELD_TYPE (type, i));
- fprintf_filtered (stream, "%.*s",
+ fprintf_filtered (stream, "%.*s",
ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),
TYPE_FIELD_NAME (type, i));
annotate_field_name_end ();
if (TYPE_FIELD_PACKED (type, i))
{
- struct value* v;
+ struct value *v;
/* Bitfields require special handling, especially due to byte
order problems. */
{
int bit_pos = TYPE_FIELD_BITPOS (type, i);
int bit_size = TYPE_FIELD_BITSIZE (type, i);
-
+
adjust_type_signedness (TYPE_FIELD_TYPE (type, i));
v = ada_value_primitive_packed_val (NULL, valaddr,
bit_pos / HOST_CHAR_BIT,
bit_pos % HOST_CHAR_BIT,
- bit_size,
+ bit_size,
TYPE_FIELD_TYPE (type, i));
- val_print (TYPE_FIELD_TYPE(type, i), VALUE_CONTENTS (v), 0, 0,
+ val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
stream, format, 0, recurse + 1, pretty);
}
}
else
- ada_val_print (TYPE_FIELD_TYPE (type, i),
- valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
- 0, 0, stream, format, 0, recurse + 1, pretty);
+ ada_val_print (TYPE_FIELD_TYPE (type, i),
+ valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
+ 0, 0, stream, format, 0, recurse + 1, pretty);
annotate_field_end ();
}
projects / deliverable / binutils-gdb.git / blobdiff