From 621821900289e9ef3472dc430d6fcf4d55b301e2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2020 17:39:52 -0600 Subject: [PATCH] Introduce c_value_print_inner This introduces c_value_print_inner, which implements the la_value_print_inner method for the C family of languages. In this patch, it is just a simple wrapper of c_val_print. However, subsequent patches will convert it to use the value API. The transformation is done this way to make each patch easier to review. Future patches will apply this same treatment to other languages as well. gdb/ChangeLog 2020-03-13 Tom Tromey * opencl-lang.c (opencl_language_defn): Use c_value_print_inner. * objc-lang.c (objc_language_defn): Use c_value_print_inner. * c-valprint.c (c_value_print_inner): New function. * c-lang.h (c_value_print_inner): Declare. * c-lang.c (c_language_defn, cplus_language_defn) (asm_language_defn, minimal_language_defn): Use c_value_print_inner. --- gdb/ChangeLog | 10 ++++++++++ gdb/c-lang.c | 8 ++++---- gdb/c-lang.h | 5 +++++ gdb/c-valprint.c | 11 +++++++++++ gdb/objc-lang.c | 2 +- gdb/opencl-lang.c | 2 +- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 734f77e1cc3..add19fe186f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2020-03-13 Tom Tromey + + * opencl-lang.c (opencl_language_defn): Use c_value_print_inner. + * objc-lang.c (objc_language_defn): Use c_value_print_inner. + * c-valprint.c (c_value_print_inner): New function. + * c-lang.h (c_value_print_inner): Declare. + * c-lang.c (c_language_defn, cplus_language_defn) + (asm_language_defn, minimal_language_defn): Use + c_value_print_inner. + 2020-03-13 Tom Tromey * p-valprint.c (pascal_object_print_value_fields): Now static. diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 3526674b2e6..c919f02fa72 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -904,7 +904,7 @@ extern const struct language_defn c_language_defn = c_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline */ @@ -1050,7 +1050,7 @@ extern const struct language_defn cplus_language_defn = c_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ cplus_skip_trampoline, /* Language specific skip_trampoline */ @@ -1105,7 +1105,7 @@ extern const struct language_defn asm_language_defn = c_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline */ @@ -1160,7 +1160,7 @@ extern const struct language_defn minimal_language_defn = c_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline */ diff --git a/gdb/c-lang.h b/gdb/c-lang.h index b8bc3804862..7638ccf6d52 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -87,6 +87,11 @@ extern void c_val_print (struct type *, struct value *, const struct value_print_options *); +/* Implement la_value_print_inner for the C family of languages. */ + +extern void c_value_print_inner (struct value *, struct ui_file *, int, + const struct value_print_options *); + extern void c_value_print (struct value *, struct ui_file *, const struct value_print_options *); diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index bee0c18abf8..b5ae3fac48f 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -557,6 +557,17 @@ c_val_print (struct type *type, break; } } + +/* See c-lang.h. */ + +void +c_value_print_inner (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) +{ + c_val_print (value_type (val), value_embedded_offset (val), + value_address (val), stream, recurse, val, options); +} + void c_value_print (struct value *val, struct ui_file *stream, diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index c277dc90947..5126e9f4ca9 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -382,7 +382,7 @@ extern const struct language_defn objc_language_defn = { c_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ objc_skip_trampoline, /* Language specific skip_trampoline */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index c4afa3a2cd3..a48079881b5 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1061,7 +1061,7 @@ extern const struct language_defn opencl_language_defn = opencl_print_type, /* Print a type using appropriate syntax */ c_print_typedef, /* Print a typedef using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ - nullptr, /* la_value_print_inner */ + c_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value */ default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline */ -- 2.30.2