diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1acf26d8e..c58a91556d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,47 @@ +2020-06-17 Andrew Burgess + + * ada-lang.c (ada_language_data): Delete la_value_print_inner + initializer. + (ada_language::value_print_inner): New member function. + * c-lang.c (c_language_data): Delete la_value_print_inner + initializer. + (cplus_language_data): Likewise. + (asm_language_data): Likewise. + (minimal_language_data): Likewise. + * d-lang.c (d_language_data): Likewise. + (d_language::value_print_inner): New member function. + * f-lang.c (f_language_data): Delete la_value_print_inner + initializer. + (f_language::value_print_inner): New member function. + * f-lang.h (f_value_print_innner): Rename to... + (f_value_print_inner): ...this (note spelling of 'inner'). + * f-valprint.c (f_value_print_innner): Rename to... + (f_value_print_inner): ...this (note spelling of 'inner'). + * go-lang.c (go_language_data): Delete la_value_print_inner + initializer. + (go_language::value_print_inner): New member function. + * language.c (language_defn::value_print_inner): Define new member + function. + (unk_lang_value_print_inner): Delete. + (unknown_language_data): Delete la_value_print_inner initializer. + (unknown_language::value_print_inner): New member function. + (auto_language_data): Delete la_value_print_inner initializer. + (auto_language::value_print_inner): New member function. + * language.h (language_data): Delete la_value_print_inner field. + (language_defn::value_print_inner): Delcare new member function. + * m2-lang.c (m2_language_data): Delete la_value_print_inner + initializer. + (m2_language::value_print_inner): New member function. + * objc-lang.c (objc_language_data): Delete la_value_print_inner + initializer. + * opencl-lang.c (opencl_language_data): Likewise. + * p-lang.c (pascal_language_data): Likewise. + (pascal_language::value_print_inner): New member function. + * rust-lang.c (rust_language_data): Delete la_value_print_inner + initializer. + (rust_language::value_print_inner): New member function. + * valprint.c (do_val_print): Update call to value_print_inner. + 2020-06-17 Andrew Burgess * ada-lang.c (ada_language_data): Delete la_value_print diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 85483d4e4b..a3ce7c325b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13764,7 +13764,6 @@ extern const struct language_data ada_language_data = ada_printstr, /* Function to print string constant */ emit_char, /* Function to print single char (not used) */ ada_print_typedef, /* Print a typedef using appropriate syntax */ - ada_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ ada_lookup_symbol_nonlocal, /* Looking up non-local symbols. */ @@ -14108,6 +14107,15 @@ public: return ada_value_print (val, stream, options); } + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return ada_value_print_inner (val, stream, recurse, options); + } + protected: /* See language.h. */ diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 6aa05a6311..cead372ae6 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -895,7 +895,6 @@ extern const struct language_data c_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1005,7 +1004,6 @@ extern const struct language_data cplus_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1203,7 +1201,6 @@ extern const struct language_data asm_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1268,7 +1265,6 @@ extern const struct language_data minimal_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/d-lang.c b/gdb/d-lang.c index 553b38de81..dff9d470bc 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -149,7 +149,6 @@ extern const struct language_data d_language_data = c_emit_char, /* Print a single char. */ c_print_typedef, /* Print a typedef using appropriate syntax. */ - d_value_print_inner, /* la_value_print_inner */ "this", false, /* la_store_sym_names_in_linkage_form_p */ d_lookup_symbol_nonlocal, @@ -257,6 +256,15 @@ public: { c_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return d_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the D language class. */ diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 3e2c97c061..d5b2bf286d 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -570,7 +570,6 @@ extern const struct language_data f_language_data = f_printstr, /* function to print string constant */ f_emit_char, /* Function to print a single character */ f_print_typedef, /* Print a typedef using appropriate syntax */ - f_value_print_innner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -697,6 +696,16 @@ public: code); } + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return f_value_print_inner (val, stream, recurse, options); + } + + protected: /* See language.h. */ diff --git a/gdb/f-lang.h b/gdb/f-lang.h index 84a63a8a41..4710b14aa6 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -38,7 +38,7 @@ extern void f_print_type (struct type *, const char *, struct ui_file *, int, /* Implement la_value_print_inner for Fortran. */ -extern void f_value_print_innner (struct value *val, struct ui_file *stream, +extern void f_value_print_inner (struct value *val, struct ui_file *stream, int recurse, const struct value_print_options *options); diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index 972d1652db..6ed1c340c7 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -211,7 +211,7 @@ static const struct generic_val_print_decorations f_decorations = /* See f-lang.h. */ void -f_value_print_innner (struct value *val, struct ui_file *stream, int recurse, +f_value_print_inner (struct value *val, struct ui_file *stream, int recurse, const struct value_print_options *options) { struct type *type = check_typedef (value_type (val)); diff --git a/gdb/go-lang.c b/gdb/go-lang.c index 14d63ab7e8..9fdd45290f 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -534,7 +534,6 @@ extern const struct language_data go_language_data = c_emit_char, /* Print a single char. */ c_print_typedef, /* Print a typedef using appropriate syntax. */ - go_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, @@ -631,6 +630,15 @@ public: { go_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return go_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Go language class. */ diff --git a/gdb/language.c b/gdb/language.c index 5b47a4956e..d93b475670 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -641,6 +641,16 @@ language_defn::value_print (struct value *val, struct ui_file *stream, return c_value_print (val, stream, options); } +/* See language.h. */ + +void +language_defn::value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const +{ + return c_value_print_inner (val, stream, recurse, options); +} + /* The default implementation of the get_symbol_name_matcher_inner method from the language_defn class. Matches with strncmp_iw. */ @@ -739,15 +749,6 @@ unk_lang_printstr (struct ui_file *stream, struct type *type, "function unk_lang_printstr called.")); } -static void -unk_lang_value_print_inner (struct value *val, - struct ui_file *stream, int recurse, - const struct value_print_options *options) -{ - error (_("internal error - unimplemented " - "function unk_lang_value_print_inner called.")); -} - static const struct op_print unk_op_print_tab[] = { {NULL, OP_NULL, PREC_NULL, 0} @@ -782,7 +783,6 @@ extern const struct language_data unknown_language_data = unk_lang_printstr, unk_lang_emit_char, default_print_typedef, /* Print a typedef using appropriate syntax */ - unk_lang_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ true, /* store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -834,6 +834,15 @@ public: { error (_("unimplemented unknown_language::value_print called")); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + error (_("unimplemented unknown_language::value_print_inner called")); + } }; /* Single instance of the unknown language class. */ @@ -859,7 +868,6 @@ extern const struct language_data auto_language_data = unk_lang_printstr, unk_lang_emit_char, default_print_typedef, /* Print a typedef using appropriate syntax */ - unk_lang_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -911,6 +919,15 @@ public: { error (_("unimplemented auto_language::value_print called")); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + error (_("unimplemented auto_language::value_print_inner called")); + } }; /* Single instance of the fake "auto" language. */ diff --git a/gdb/language.h b/gdb/language.h index 4b27c010b0..06978d7067 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -258,13 +258,6 @@ struct language_data void (*la_print_typedef) (struct type *type, struct symbol *new_symbol, struct ui_file *stream); - /* Print a value using syntax appropriate for this language. - RECURSE is the recursion depth. It is zero-based. */ - - void (*la_value_print_inner) (struct value *, struct ui_file *, - int recurse, - const struct value_print_options *); - /* Now come some hooks for lookup_symbol. */ /* If this is non-NULL, specifies the name that of the implicit @@ -542,6 +535,12 @@ struct language_defn : language_data virtual void value_print (struct value *val, struct ui_file *stream, const struct value_print_options *options) const; + /* Print a value using syntax appropriate for this language. RECURSE is + the recursion depth. It is zero-based. */ + virtual void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const; + protected: /* This is the overridable part of the GET_SYMBOL_NAME_MATCHER method. diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 615c2f95bd..6bc4eb089e 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -368,7 +368,6 @@ extern const struct language_data m2_language_data = m2_printstr, /* function to print string constant */ m2_emit_char, /* Function to print a single character */ m2_print_typedef, /* Print a typedef using appropriate syntax */ - m2_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -423,6 +422,15 @@ public: { m2_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return m2_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the M2 language. */ diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index aa9d1a9312..387c6ba7e1 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -343,7 +343,6 @@ extern const struct language_data objc_language_data = c_printstr, /* Function to print string constant */ c_emit_char, c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ "self", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 1b7553dde6..5cb9839000 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1022,7 +1022,6 @@ extern const struct language_data opencl_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/p-lang.c b/gdb/p-lang.c index ff3ba3b56e..4c9d354fc0 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -399,7 +399,6 @@ extern const struct language_data pascal_language_data = pascal_printstr, /* Function to print string constant */ pascal_emit_char, /* Print a single char */ pascal_print_typedef, /* Print a typedef using appropriate syntax */ - pascal_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -485,6 +484,15 @@ public: { return pascal_value_print (val, stream, options); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return pascal_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Pascal language class. */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index e48be115af..c2fd3ba594 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -2040,7 +2040,6 @@ extern const struct language_data rust_language_data = rust_printstr, /* Function to print string constant */ rust_emitchar, /* Print a single char */ rust_print_typedef, /* Print a typedef using appropriate syntax */ - rust_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ rust_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -2139,6 +2138,15 @@ public: (xstrprintf ("*(%s as *mut %s)", core_addr_to_string (addr), name.c_str ())); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return rust_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Rust language class. */ diff --git a/gdb/valprint.c b/gdb/valprint.c index f254980526..51c77c3e6d 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -979,7 +979,7 @@ do_val_print (struct value *value, struct ui_file *stream, int recurse, try { - language->la_value_print_inner (value, stream, recurse, &local_opts); + language->value_print_inner (value, stream, recurse, &local_opts); } catch (const gdb_exception_error &except) {