gdb/ada-valprint.c - Issue 124383005: GDB 7.6.50

Unified Diff: gdb/ada-valprint.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gdb/ada-valprint.c

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c

index 95ec7ecdb5ce21cceb7c00b19141b1f5cd83e650..9f64e569a38a12548c884b5de31bea2ec3cd0e00 100644

--- a/gdb/ada-valprint.c

+++ b/gdb/ada-valprint.c

@@ -1,7 +1,6 @@

/* Support for printing Ada values for GDB, the GNU debugger.

- Software Foundation, Inc.

This file is part of GDB.

@@ -20,7 +19,7 @@

#include "defs.h"

#include <ctype.h>

-#include "gdb_string.h"

+#include <string.h>

#include "symtab.h"

#include "gdbtypes.h"

#include "expression.h"

@@ -172,7 +171,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,

if (i != 0)

{

- if (options->prettyprint_arrays)

+ if (options->prettyformat_arrays)

{

fprintf_filtered (stream, ",\n");

print_spaces_filtered (2 + 2 * recurse, stream);

@@ -228,7 +227,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,

{

if (j > i0)

{

- if (options->prettyprint_arrays)

+ if (options->prettyformat_arrays)

{

fprintf_filtered (stream, ",\n");

print_spaces_filtered (2 + 2 * recurse, stream);

@@ -321,7 +320,6 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,

{

char buffer[64];

char *s, *result;

- int len;

struct ui_file *tmp_stream = mem_fileopen ();

struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream);

@@ -330,7 +328,6 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,

do_cleanups (cleanups);

result = buffer;

- len = strlen (result);

/* Modify for Ada rules. */

@@ -510,10 +507,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,

{

if (in_quotes)

{

- if (options->inspect_it)

- fputs_filtered ("\\\", ", stream);

- else

- fputs_filtered ("\", ", stream);

+ fputs_filtered ("\", ", stream);

in_quotes = 0;

}

fputs_filtered ("'", stream);

@@ -529,10 +523,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,

{

if (!in_quotes)

{

- if (options->inspect_it)

- fputs_filtered ("\\\"", stream);

- else

- fputs_filtered ("\"", stream);

+ fputs_filtered ("\"", stream);

in_quotes = 1;

}

ada_emit_char (char_at (string, i, type_len, byte_order),

@@ -543,12 +534,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,

/* Terminate the quotes if necessary. */

if (in_quotes)

- {

- if (options->inspect_it)

- fputs_filtered ("\\\"", stream);

- else

- fputs_filtered ("\"", stream);

- }

+ fputs_filtered ("\"", stream);

if (force_ellipses || i < length)

fputs_filtered ("...", stream);

@@ -614,7 +600,7 @@ ada_val_print_array (struct type *type, const gdb_byte *valaddr,

eltlen = TYPE_LENGTH (elttype);

len = TYPE_LENGTH (type) / eltlen;

- if (options->prettyprint_arrays)

+ if (options->prettyformat_arrays)

print_spaces_filtered (2 + 2 * recurse, stream);

/* If requested, look for the first null char and only print

@@ -730,9 +716,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,

if (ada_is_fixed_point_type (type))

{

LONGEST v = unpack_long (type, valaddr + offset_aligned);

- int len = TYPE_LENGTH (type);

- fprintf_filtered (stream, len < 4 ? "%.11g" : "%.17g",

+ fprintf_filtered (stream, TYPE_LENGTH (type) < 4 ? "%.11g" : "%.17g",

(double) ada_fixed_to_float (type, v));

return;

}

@@ -892,6 +877,9 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,

deref_val = coerce_ref_if_computed (original_value);

if (deref_val)

{

+ if (ada_is_tagged_type (value_type (deref_val), 1))

+ deref_val = ada_tag_value_at_base_address (deref_val);

common_val_print (deref_val, stream, recurse + 1, options,

current_language);

break;

@@ -905,6 +893,9 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,

(lookup_pointer_type (elttype),

deref_val_int));

+ if (ada_is_tagged_type (value_type (deref_val), 1))

+ deref_val = ada_tag_value_at_base_address (deref_val);

val_print (value_type (deref_val),

value_contents_for_printing (deref_val),

value_embedded_offset (deref_val),

@@ -1010,7 +1001,7 @@ print_record (struct type *type, const gdb_byte *valaddr,

if (print_field_values (type, valaddr, offset,

stream, recurse, val, options,

- 0, type, offset) != 0 && options->pretty)

+ 0, type, offset) != 0 && options->prettyformat)

{

fprintf_filtered (stream, "\n");

print_spaces_filtered (2 * recurse, stream);

@@ -1076,7 +1067,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,

fprintf_filtered (stream, ", ");

comma_needed = 1;

- if (options->pretty)

+ if (options->prettyformat)

{

fprintf_filtered (stream, "\n");

print_spaces_filtered (2 + 2 * recurse, stream);

@@ -1085,29 +1076,14 @@ print_field_values (struct type *type, const gdb_byte *valaddr,

{

wrap_here (n_spaces (2 + 2 * recurse));

}

- if (options->inspect_it)

- {

- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)

- fputs_filtered ("\"( ptr \"", stream);

- else

- fputs_filtered ("\"( nodef \"", stream);

- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),

- language_cplus, DMGL_NO_OPTS);

- fputs_filtered ("\" \"", stream);

- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),

- language_cplus, DMGL_NO_OPTS);

- fputs_filtered ("\") \"", stream);

- }

- else

- {

- annotate_field_begin (TYPE_FIELD_TYPE (type, i));

- fprintf_filtered (stream, "%.*s",

- ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),

- TYPE_FIELD_NAME (type, i));

- annotate_field_name_end ();

- fputs_filtered (" => ", stream);

- annotate_field_value ();

- }

+ annotate_field_begin (TYPE_FIELD_TYPE (type, i));

+ fprintf_filtered (stream, "%.*s",

+ ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),

+ TYPE_FIELD_NAME (type, i));

+ annotate_field_name_end ();

+ fputs_filtered (" => ", stream);

+ annotate_field_value ();

if (TYPE_FIELD_PACKED (type, i))

{

« no previous file with comments | « gdb/ada-typeprint.c ('k') | gdb/ada-varobj.h » ('j') | no next file with comments »