OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb: Convert language la_value_print_inner field to a method 

This commit changes the language_data::la_value_print_inner function
pointer member variable into a member function of language_defn.

There should be no user visible changes after this commit.

gdb/ChangeLog:

	* 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.
This commit is contained in:
Andrew Burgess 2020-06-01 15:36:30 +01:00
parent a1d1fa3e41
commit ebe2334ee6
16 changed files with 145 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gdb/ChangeLog
View File

@ -1,3 +1,47 @@
2020-06-17 Andrew Burgess <andrew.burgess@embecosm.com>
* 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 <andrew.burgess@embecosm.com>
* ada-lang.c (ada_language_data): Delete la_value_print

10
gdb/ada-lang.c
View File

@ -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. */

4
gdb/c-lang.c
View File

@ -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 */

10
gdb/d-lang.c
View File

@ -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. */

11
gdb/f-lang.c
View File

@ -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. */

2
gdb/f-lang.h
View File

@ -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);

2
gdb/f-valprint.c
View File

@ -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));

10
gdb/go-lang.c
View File

@ -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. */

39
gdb/language.c
View File

@ -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. */

13
gdb/language.h
View File

@ -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.

10
gdb/m2-lang.c
View File

@ -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. */

1
gdb/objc-lang.c
View File

@ -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 */

1
gdb/opencl-lang.c
View File

@ -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 */

10
gdb/p-lang.c
View File

@ -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. */

10
gdb/rust-lang.c
View File

@ -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. */

2
gdb/valprint.c
View File

@ -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)
{