projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add virtual destructor to tui_layout_base
[deliverable/binutils-gdb.git]
/
gdb
/
d-valprint.c
diff --git
a/gdb/d-valprint.c
b/gdb/d-valprint.c
index ba3f1f0fe4b5d831fd51dfad8be42c8a881de591..54652364a8f3960549ace19bedb5959b982d9f75 100644
(file)
--- a/
gdb/d-valprint.c
+++ b/
gdb/d-valprint.c
@@
-1,6
+1,6
@@
/* Support for printing D values for GDB, the GNU debugger.
/* Support for printing D values for GDB, the GNU debugger.
- Copyright (C) 2008
, 2009, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2008
-2019
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-23,28
+23,32
@@
#include "d-lang.h"
#include "c-lang.h"
#include "d-lang.h"
#include "c-lang.h"
-/* Assuming that TYPE is a TYPE_CODE_STRUCT, verify that TYPE is
- a dynamic array, and then print its value to STREAM. Return
- the number of string characters printed, or -1 if TYPE is not
- a dynamic array. */
+/* Assuming that TYPE is a TYPE_CODE_STRUCT, verify that TYPE is
a
+ dynamic array, and then print its value to STREAM. Return zero if
+ TYPE is a dynamic array, non-zero otherwise. */
+
static int
static int
-dynamic_array_type (struct type *type,
const gdb_byte *valaddr,
-
int
embedded_offset, CORE_ADDR address,
+dynamic_array_type (struct type *type,
+
LONGEST
embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
struct ui_file *stream, int recurse,
+ struct value *val,
const struct value_print_options *options)
{
if (TYPE_NFIELDS (type) == 2
&& TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_INT
&& strcmp (TYPE_FIELD_NAME (type, 0), "length") == 0
const struct value_print_options *options)
{
if (TYPE_NFIELDS (type) == 2
&& TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_INT
&& strcmp (TYPE_FIELD_NAME (type, 0), "length") == 0
- && strcmp (TYPE_FIELD_NAME (type, 1), "ptr") == 0)
+ && strcmp (TYPE_FIELD_NAME (type, 1), "ptr") == 0
+ && !value_bits_any_optimized_out (val,
+ TARGET_CHAR_BIT * embedded_offset,
+ TARGET_CHAR_BIT * TYPE_LENGTH (type)))
{
CORE_ADDR addr;
struct type *elttype;
struct type *true_type;
struct type *ptr_type;
{
CORE_ADDR addr;
struct type *elttype;
struct type *true_type;
struct type *ptr_type;
- const gdb_byte *ptraddr;
- struct value *val;
+ struct value *ival;
int length;
int length;
+ const gdb_byte *valaddr = value_contents_for_printing (val);
length = unpack_field_as_long (type, valaddr + embedded_offset, 0);
length = unpack_field_as_long (type, valaddr + embedded_offset, 0);
@@
-56,35
+60,37
@@
dynamic_array_type (struct type *type, const gdb_byte *valaddr,
true_type = check_typedef (elttype);
true_type = lookup_array_range_type (true_type, 0, length - 1);
true_type = check_typedef (elttype);
true_type = lookup_array_range_type (true_type, 0, length - 1);
- val = value_at (true_type, addr);
-
ptraddr = value_contents (
val);
+
i
val = value_at (true_type, addr);
+
true_type = value_type (i
val);
- return d_val_print (true_type, ptraddr, 0, addr, stream, recurse + 1,
- options);
+ d_val_print (true_type,
+ value_embedded_offset (ival), addr,
+ stream, recurse + 1, ival, options);
+ return 0;
}
}
- return
-
1;
+ return 1;
}
/* Implements the la_val_print routine for language D. */
}
/* Implements the la_val_print routine for language D. */
-int
-d_val_print (struct type *type,
const gdb_byte *valaddr,
int embedded_offset,
+void
+d_val_print (struct type *type, int embedded_offset,
CORE_ADDR address, struct ui_file *stream, int recurse,
CORE_ADDR address, struct ui_file *stream, int recurse,
+ struct value *val,
const struct value_print_options *options)
{
int ret;
const struct value_print_options *options)
{
int ret;
-
CHECK_TYPEDEF
(type);
+
type = check_typedef
(type);
switch (TYPE_CODE (type))
{
case TYPE_CODE_STRUCT:
switch (TYPE_CODE (type))
{
case TYPE_CODE_STRUCT:
- ret = dynamic_array_type (type, valaddr, embedded_offset, address,
- stream, recurse, options);
- if (ret != -1)
- break;
+ ret = dynamic_array_type (type, embedded_offset, address,
+ stream, recurse, val, options);
+ if (ret == 0)
+ break;
+ /* Fall through. */
default:
default:
-
ret = c_val_print (type, valaddr
, embedded_offset, address, stream,
-
recurse
, options);
+
c_val_print (type
, embedded_offset, address, stream,
+
recurse, val
, options);
}
}
-
- return ret;
}
}
This page took
0.025904 seconds
and
4
git commands to generate.