From 32b72a4208acf51e0d12ad77ea5ddf671b08a963 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 7 Feb 2011 17:49:32 +0000 Subject: [PATCH] * valprint.c (val_print): Extend comment. * ada-valprint.c (ada_valprint): Rewrite comment deferring interface explanation to val_print. (ada_val_print_array): Adjust comment to current interface. (print_field_values): Adjust comment to current interface. * c-valprint.c (c_val_print): Rewrite comment deferring interface explanation to val_print. * f-valprint.c (f_val_print): Ditto. * jv-valprint.c (java_val_print): Ditto. * m2-valprint.c (m2_val_print): Ditto. * p-valprint.c (pascal_val_print): Ditto. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/ada-valprint.c | 25 ++++++++++--------------- gdb/c-valprint.c | 10 +++------- gdb/f-valprint.c | 9 +++------ gdb/jv-valprint.c | 9 +++------ gdb/m2-valprint.c | 9 +++------ gdb/p-valprint.c | 12 +++--------- gdb/valprint.c | 36 ++++++++++++++++++++++-------------- 8 files changed, 61 insertions(+), 63 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 37531225bff..641f22563d9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2011-02-07 Pedro Alves + + * valprint.c (val_print): Extend comment. + * ada-valprint.c (ada_valprint): Rewrite comment deferring + interface explanation to val_print. + (ada_val_print_array): Adjust comment to current interface. + (print_field_values): Adjust comment to current interface. + * c-valprint.c (c_val_print): Rewrite comment deferring interface + explanation to val_print. + * f-valprint.c (f_val_print): Ditto. + * jv-valprint.c (java_val_print): Ditto. + * m2-valprint.c (m2_val_print): Ditto. + * p-valprint.c (pascal_val_print): Ditto. + 2011-02-07 Thiago Jung Bauermann * breakpoint.c (parse_breakpoint_sals): Fix description. diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index bd297c6c1f0..bc3ea2678b4 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -564,15 +564,9 @@ ada_printstr (struct ui_file *stream, struct type *type, } -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data is printed as a string, returns the number of string characters - printed. - - RECURSE indicates the amount of indentation to supply before - continuation lines; this amount is roughly twice the value of RECURSE. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int ada_val_print (struct type *type, const gdb_byte *valaddr, @@ -598,7 +592,7 @@ ada_val_print (struct type *type, const gdb_byte *valaddr, } /* Assuming TYPE is a simple array, print the value of this array located - at VALADDR. See ada_val_print for a description of the various + at VALADDR + OFFSET. See ada_val_print for a description of the various parameters of this function; they are identical. The semantics of the return value is also identical to ada_val_print. */ @@ -1026,13 +1020,14 @@ print_record (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, ")"); } -/* Print out fields of value at VALADDR having structure type TYPE. +/* Print out fields of value at VALADDR + OFFSET having structure type TYPE. - TYPE, VALADDR, STREAM, RECURSE, and OPTIONS have the - same meanings as in ada_print_value and ada_val_print. + TYPE, VALADDR, OFFSET, STREAM, RECURSE, and OPTIONS have the same + meanings as in ada_print_value and ada_val_print. - OUTER_TYPE and OUTER_VALADDR give type and address of enclosing record - (used to get discriminant values when printing variant parts). + OUTER_TYPE and OUTER_OFFSET give type and address of enclosing + record (used to get discriminant values when printing variant + parts). COMMA_NEEDED is 1 if fields have been printed at the current recursion level, so that a comma is needed before any field printed by this diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 287dc0ba2a7..baad597cf02 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -142,13 +142,9 @@ c_textual_element_type (struct type *type, char format) return 0; } - -/* Print data of type TYPE located at VALADDR (within GDB), which came - from the inferior at address ADDRESS, onto stdio stream STREAM - according to OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string - characters printed. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int c_val_print (struct type *type, const gdb_byte *valaddr, diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index a15e777192e..3280ddcb5d9 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -242,12 +242,9 @@ Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"), } -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string characters - printed. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c index b282da89655..0e5b97f10cc 100644 --- a/gdb/jv-valprint.c +++ b/gdb/jv-valprint.c @@ -474,12 +474,9 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, "}"); } -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string characters - printed. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int java_val_print (struct type *type, const gdb_byte *valaddr, diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c index f22ee2fb8a4..ed997b16b60 100644 --- a/gdb/m2-valprint.c +++ b/gdb/m2-valprint.c @@ -310,12 +310,9 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr, } -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string characters - printed. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index ca7606a72e8..8e790702249 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -40,15 +40,9 @@ #include "cp-support.h" - - -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string characters - printed. */ - +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int pascal_val_print (struct type *type, const gdb_byte *valaddr, diff --git a/gdb/valprint.c b/gdb/valprint.c index b6b96d4ec4f..b32d6fca5e5 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -293,20 +293,28 @@ val_print_optimized_out (struct ui_file *stream) fprintf_filtered (stream, _("")); } -/* Print using the given LANGUAGE the data of type TYPE located at VALADDR - (within GDB), which came from the inferior at address ADDRESS, onto - stdio stream STREAM according to OPTIONS. - - If the data are a string pointer, returns the number of string characters - printed. - - FIXME: The data at VALADDR is in target byte order. If gdb is ever - enhanced to be able to debug more than the single target it was compiled - for (specific CPU type and thus specific target byte ordering), then - either the print routines are going to have to take this into account, - or the data is going to have to be passed into here already converted - to the host byte ordering, whichever is more convenient. */ - +/* Print using the given LANGUAGE the data of type TYPE located at + VALADDR + EMBEDDED_OFFSET (within GDB), which came from the + inferior at address ADDRESS + EMBEDDED_OFFSET, onto stdio stream + STREAM according to OPTIONS. VAL is the whole object that came + from ADDRESS. VALADDR must point to the head of VAL's contents + buffer. + + The language printers will pass down an adjusted EMBEDDED_OFFSET to + further helper subroutines as subfields of TYPE are printed. In + such cases, VALADDR is passed down unadjusted, as well as VAL, so + that VAL can be queried for metadata about the contents data being + printed, using EMBEDDED_OFFSET as an offset into VAL's contents + buffer. For example: "has this field been optimized out", or "I'm + printing an object while inspecting a traceframe; has this + particular piece of data been collected?". + + RECURSE indicates the amount of indentation to supply before + continuation lines; this amount is roughly twice the value of + RECURSE. + + If the data is printed as a string, returns the number of string + characters printed. */ int val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, -- 2.30.2