projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable async mode in the target in attach_cmd.
[binutils-gdb.git]
/
gdb
/
p-valprint.c
diff --git
a/gdb/p-valprint.c
b/gdb/p-valprint.c
index 3b1303d1248871214b2610bc74ef54b3a8e838a1..8334ab9fe8443f1a2c7f18e69417ec5e8f0949e4 100644
(file)
--- a/
gdb/p-valprint.c
+++ b/
gdb/p-valprint.c
@@
-1,6
+1,6
@@
/* Support for printing Pascal values for GDB, the GNU debugger.
/* Support for printing Pascal values for GDB, the GNU debugger.
- Copyright (C) 2000-202
0
Free Software Foundation, Inc.
+ Copyright (C) 2000-202
2
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-20,7
+20,7
@@
/* This file is derived from c-valprint.c */
#include "defs.h"
/* This file is derived from c-valprint.c */
#include "defs.h"
-#include "gdb_obstack.h"
+#include "gdb
support/gdb
_obstack.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
@@
-64,13
+64,13
@@
static const struct generic_val_print_decorations p_decorations =
/* See p-lang.h. */
void
/* See p-lang.h. */
void
-pascal_
value_print_inner (struct value *val, struct ui_file *stream
,
- int recurse,
- const struct value_print_options *options)
+pascal_
language::value_print_inner (struct value *val
,
+
struct ui_file *stream,
int recurse,
+ const struct value_print_options *options) const
{
struct type *type = check_typedef (value_type (val));
{
struct type *type = check_typedef (value_type (val));
- struct gdbarch *gdbarch =
get_type_arch (type
);
+ struct gdbarch *gdbarch =
type->arch (
);
enum bfd_endian byte_order = type_byte_order (type);
unsigned int i = 0; /* Number of characters printed */
unsigned len;
enum bfd_endian byte_order = type_byte_order (type);
unsigned int i = 0; /* Number of characters printed */
unsigned len;
@@
-80,7
+80,7
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
struct type *char_type;
CORE_ADDR addr;
int want_space = 0;
struct type *char_type;
CORE_ADDR addr;
int want_space = 0;
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = value_contents_for_printing (val)
.data ()
;
switch (type->code ())
{
switch (type->code ())
{
@@
-116,8
+116,8
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
len = temp_len;
}
len = temp_len;
}
-
LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type)
,
-
valaddr, len,
NULL, 0, options);
+
printstr (stream, TYPE_TARGET_TYPE (type), valaddr, len
,
+ NULL, 0, options);
i = len;
}
else
i = len;
}
else
@@
-184,9
+184,9
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
pointed to, unless pointer is null. */
if (((TYPE_LENGTH (elttype) == 1
&& (elttype->code () == TYPE_CODE_INT
pointed to, unless pointer is null. */
if (((TYPE_LENGTH (elttype) == 1
&& (elttype->code () == TYPE_CODE_INT
-
|| elttype->code () == TYPE_CODE_CHAR))
-
|| ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4)
-
&& elttype->code () == TYPE_CODE_CHAR))
+ || elttype->code () == TYPE_CODE_CHAR))
+ || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4)
+ && elttype->code () == TYPE_CODE_CHAR))
&& (options->format == 0 || options->format == 's')
&& addr != 0)
{
&& (options->format == 0 || options->format == 's')
&& addr != 0)
{
@@
-200,8
+200,8
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
as GDB does not recognize stabs pascal strings
Pascal strings are mapped to records
with lowercase names PM. */
as GDB does not recognize stabs pascal strings
Pascal strings are mapped to records
with lowercase names PM. */
- if (
is_pascal
_string_type (elttype, &length_pos, &length_size,
- &string_pos, &char_type, NULL)
+ if (
pascal_is
_string_type (elttype, &length_pos, &length_size,
+ &string_pos, &char_type, NULL)
> 0
&& addr != 0)
{
ULONGEST string_length;
&& addr != 0)
{
ULONGEST string_length;
@@
-255,7
+255,7
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
if (wsym)
{
if (wsym)
{
- wtype =
SYMBOL_TYPE (wsym
);
+ wtype =
wsym->type (
);
}
else
{
}
else
{
@@
-306,20
+306,20
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
print_address_demangle
(options, gdbarch,
extract_unsigned_integer
print_address_demangle
(options, gdbarch,
extract_unsigned_integer
- (valaddr +
TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET
) / 8,
+ (valaddr +
type->field (VTBL_FNADDR_OFFSET).loc_bitpos (
) / 8,
TYPE_LENGTH (type->field (VTBL_FNADDR_OFFSET).type ()),
byte_order),
stream, demangle);
}
else
{
TYPE_LENGTH (type->field (VTBL_FNADDR_OFFSET).type ()),
byte_order),
stream, demangle);
}
else
{
-
if (is_pascal
_string_type (type, &length_pos, &length_size,
-
&string_pos, &char_type, NULL)
)
+
if (pascal_is
_string_type (type, &length_pos, &length_size,
+
&string_pos, &char_type, NULL) > 0
)
{
len = extract_unsigned_integer (valaddr + length_pos,
length_size, byte_order);
{
len = extract_unsigned_integer (valaddr + length_pos,
length_size, byte_order);
-
LA_PRINT_STRING (stream, char_type, valaddr + string_pos
,
-
len,
NULL, 0, options);
+
printstr (stream, char_type, valaddr + string_pos, len
,
+ NULL, 0, options);
}
else
pascal_object_print_value_fields (val, stream, recurse,
}
else
pascal_object_print_value_fields (val, stream, recurse,
@@
-330,7
+330,7
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
case TYPE_CODE_SET:
elttype = type->index_type ();
elttype = check_typedef (elttype);
case TYPE_CODE_SET:
elttype = type->index_type ();
elttype = check_typedef (elttype);
- if (
TYPE_STUB (elttype
))
+ if (
elttype->is_stub (
))
{
fprintf_styled (stream, metadata_style.style (), "<incomplete type>");
break;
{
fprintf_styled (stream, metadata_style.style (), "<incomplete type>");
break;
@@
-343,14
+343,15
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
fputs_filtered ("[", stream);
fputs_filtered ("[", stream);
- int bound_info = get_discrete_bounds (range, &low_bound, &high_bound);
+ int bound_info = (get_discrete_bounds (range, &low_bound, &high_bound)
+ ? 0 : -1);
if (low_bound == 0 && high_bound == -1 && TYPE_LENGTH (type) > 0)
{
/* If we know the size of the set type, we can figure out the
maximum value. */
bound_info = 0;
high_bound = TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1;
if (low_bound == 0 && high_bound == -1 && TYPE_LENGTH (type) > 0)
{
/* If we know the size of the set type, we can figure out the
maximum value. */
bound_info = 0;
high_bound = TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1;
-
TYPE_HIGH_BOUND (range) = high_bound
;
+
range->bounds ()->high.set_const_val (high_bound)
;
}
maybe_bad_bstring:
if (bound_info < 0)
}
maybe_bad_bstring:
if (bound_info < 0)
@@
-401,8
+402,8
@@
pascal_value_print_inner (struct value *val, struct ui_file *stream,
\f
void
\f
void
-pascal_value_print (struct value *val, struct ui_file *stream,
- const struct value_print_options *options)
+pascal_
language::
value_print (struct value *val, struct ui_file *stream,
+ const struct value_print_options *options) const
{
struct type *type = value_type (val);
struct value_print_options opts = *options;
{
struct type *type = value_type (val);
struct value_print_options opts = *options;
@@
-419,7
+420,7
@@
pascal_value_print (struct value *val, struct ui_file *stream,
|| type->code () == TYPE_CODE_REF)
{
/* Hack: remove (char *) for char strings. Their
|| type->code () == 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_CODE_PTR
&& type->name () == NULL
&& TYPE_TARGET_TYPE (type)->name () != NULL
if (type->code () == TYPE_CODE_PTR
&& type->name () == NULL
&& TYPE_TARGET_TYPE (type)->name () != NULL
@@
-490,7
+491,7
@@
pascal_object_is_vtbl_member (struct type *type)
|| type->code () == TYPE_CODE_PTR) /* If using thunks. */
{
/* Virtual functions tables are full of pointers
|| type->code () == TYPE_CODE_PTR) /* If using thunks. */
{
/* Virtual functions tables are full of pointers
- to virtual functions. */
+ to virtual functions. */
return pascal_object_is_vtbl_ptr_type (type);
}
}
return pascal_object_is_vtbl_ptr_type (type);
}
}
@@
-498,9
+499,7
@@
pascal_object_is_vtbl_member (struct type *type)
return 0;
}
return 0;
}
-/* Mutually recursive subroutines of pascal_object_print_value and
- pascal_value_print to print out a structure's fields:
- pascal_object_print_value_fields and pascal_object_print_value.
+/* Helper function for print pascal objects.
VAL, STREAM, RECURSE, and OPTIONS have the same meanings as in
pascal_object_print_value and c_value_print.
VAL, STREAM, RECURSE, and OPTIONS have the same meanings as in
pascal_object_print_value and c_value_print.
@@
-537,7
+536,7
@@
pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
{
struct obstack tmp_obstack = dont_print_statmem_obstack;
int fields_seen = 0;
{
struct obstack tmp_obstack = dont_print_statmem_obstack;
int fields_seen = 0;
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = value_contents_for_printing (val)
.data ()
;
if (dont_print_statmem == 0)
{
if (dont_print_statmem == 0)
{
@@
-575,7
+574,7
@@
pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
}
else
{
}
else
{
-
wrap_here (n_spaces (2 + 2 * recurse)
);
+
stream->wrap_here (2 + 2 * recurse
);
}
annotate_field_begin (type->field (i).type ());
}
annotate_field_begin (type->field (i).type ());
@@
-584,12
+583,12
@@
pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
{
fputs_filtered ("static ", stream);
fprintf_symbol_filtered (stream,
{
fputs_filtered ("static ", stream);
fprintf_symbol_filtered (stream,
-
TYPE_FIELD_NAME (type, i
),
+
type->field (i).name (
),
current_language->la_language,
DMGL_PARAMS | DMGL_ANSI);
}
else
current_language->la_language,
DMGL_PARAMS | DMGL_ANSI);
}
else
- fputs_styled (
TYPE_FIELD_NAME (type, i
),
+ fputs_styled (
type->field (i).name (
),
variable_name_style.style (), stream);
annotate_field_name_end ();
fputs_filtered (" = ", stream);
variable_name_style.style (), stream);
annotate_field_name_end ();
fputs_filtered (" = ", stream);
@@
-601,17
+600,15
@@
pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
struct value *v;
/* Bitfields require special handling, especially due to byte
struct value *v;
/* Bitfields require special handling, especially due to byte
- order problems. */
+ order problems. */
if (TYPE_FIELD_IGNORE (type, i))
{
fputs_styled ("<optimized out or zero length>",
metadata_style.style (), stream);
}
if (TYPE_FIELD_IGNORE (type, i))
{
fputs_styled ("<optimized out or zero length>",
metadata_style.style (), stream);
}
- else if (value_bits_synthetic_pointer (val,
- TYPE_FIELD_BITPOS (type,
- i),
- TYPE_FIELD_BITSIZE (type,
- i)))
+ else if (value_bits_synthetic_pointer
+ (val, type->field (i).loc_bitpos (),
+ TYPE_FIELD_BITSIZE (type, i)))
{
fputs_styled (_("<synthetic pointer>"),
metadata_style.style (), stream);
{
fputs_styled (_("<synthetic pointer>"),
metadata_style.style (), stream);
@@
-698,8
+695,8
@@
pascal_object_print_value (struct value *val, struct ui_file *stream,
if (dont_print_vb == 0)
{
/* If we're at top level, carve out a completely fresh
if (dont_print_vb == 0)
{
/* If we're at top level, carve out a completely fresh
-
chunk of the obstack and use that until this particular
-
invocation returns. */
+ chunk of the obstack and use that until this particular
+ invocation returns. */
/* Bump up the high-water mark. Now alpha is omega. */
obstack_finish (&dont_print_vb_obstack);
}
/* Bump up the high-water mark. Now alpha is omega. */
obstack_finish (&dont_print_vb_obstack);
}
@@
-769,7
+766,7
@@
pascal_object_print_value (struct value *val, struct ui_file *stream,
}
fputs_filtered ("<", stream);
/* Not sure what the best notation is in the case where there is no
}
fputs_filtered ("<", stream);
/* Not sure what the best notation is in the case where there is no
-
baseclass name. */
+ baseclass name. */
fputs_filtered (basename ? basename : "", stream);
fputs_filtered ("> = ", stream);
fputs_filtered (basename ? basename : "", stream);
fputs_filtered ("> = ", stream);
@@
-792,10
+789,10
@@
pascal_object_print_value (struct value *val, struct ui_file *stream,
if (dont_print_vb == 0)
{
/* Free the space used to deal with the printing
if (dont_print_vb == 0)
{
/* Free the space used to deal with the printing
-
of this type from top level. */
+ of this type from top level. */
obstack_free (&dont_print_vb_obstack, last_dont_print);
/* Reset watermark so that we can continue protecting
obstack_free (&dont_print_vb_obstack, last_dont_print);
/* Reset watermark so that we can continue protecting
-
ourselves from whatever we were protecting ourselves. */
+ ourselves from whatever we were protecting ourselves. */
dont_print_vb_obstack = tmp_obstack;
}
}
dont_print_vb_obstack = tmp_obstack;
}
}