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

gdb: Convert language la_compute_program field to a method

Browse Source 
This commit changes the language_data::la_compute_program 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_compute_program
	initializer.
	* c-lang.c (c_language_data): Likewise.
	(c_language::compute_program): New member function.
	(cplus_language_data): Delete la_compute_program initializer.
	(cplus_language::compute_program): New member function.
	(asm_language_data): Delete la_compute_program initializer.
	(minimal_language_data): Likewise.
	* c-lang.h (c_compute_program): Update comment.
	(cplus_compute_program): Likewise.
	* compile/compile-c-support.c (c_compute_program): Likewise.
	(cplus_compute_program): Likewise.
	* compile/compile.c (compile_to_object): Update call to
	la_compute_program.
	* d-lang.c (d_language_data): Delete la_compute_program
	initializer.
	* f-lang.c (f_language_data): Likewise.
	* go-lang.c (go_language_data): Likewise.
	* language.c (unknown_language_data): Likewise.
	(auto_language_data): Likewise.
	* language.h (language_data): Delete la_compute_program field.
	(language_defn::compute_program): New member function.
	* m2-lang.c (m2_language_data): Delete la_compute_program
	initializer.
	* objc-lang.c (objc_language_data): Likewise.
	* opencl-lang.c (opencl_language_data): Likewise.
	* p-lang.c (pascal_language_data): Likewise.
	* rust-lang.c (rust_language_data): Likewise.
This commit is contained in:
Andrew Burgess 2020-06-01 11:07:52 +01:00
parent eff93b4d48
commit 9a49ad8c52
16 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gdb/ChangeLog
View File

@ -1,3 +1,34 @@
2020-06-17 Andrew Burgess <andrew.burgess@embecosm.com>
* ada-lang.c (ada_language_data): Delete la_compute_program
initializer.
* c-lang.c (c_language_data): Likewise.
(c_language::compute_program): New member function.
(cplus_language_data): Delete la_compute_program initializer.
(cplus_language::compute_program): New member function.
(asm_language_data): Delete la_compute_program initializer.
(minimal_language_data): Likewise.
* c-lang.h (c_compute_program): Update comment.
(cplus_compute_program): Likewise.
* compile/compile-c-support.c (c_compute_program): Likewise.
(cplus_compute_program): Likewise.
* compile/compile.c (compile_to_object): Update call to
la_compute_program.
* d-lang.c (d_language_data): Delete la_compute_program
initializer.
* f-lang.c (f_language_data): Likewise.
* go-lang.c (go_language_data): Likewise.
* language.c (unknown_language_data): Likewise.
(auto_language_data): Likewise.
* language.h (language_data): Delete la_compute_program field.
(language_defn::compute_program): New member function.
* m2-lang.c (m2_language_data): Delete la_compute_program
initializer.
* objc-lang.c (objc_language_data): Likewise.
* opencl-lang.c (opencl_language_data): Likewise.
* p-lang.c (pascal_language_data): Likewise.
* rust-lang.c (rust_language_data): Likewise.
2020-06-17 Andrew Burgess <andrew.burgess@embecosm.com>
* ada-lang.c (ada_language_data) Delete

1
gdb/ada-lang.c
View File

@ -13922,7 +13922,6 @@ extern const struct language_data ada_language_data =
ada_watch_location_expression,
ada_get_symbol_name_matcher, /* la_get_symbol_name_matcher */
&ada_varobj_ops,
NULL,
ada_is_string_type,
"(...)" /* la_struct_too_deep_ellipsis */
};

24
gdb/c-lang.c
View File

@ -919,7 +919,6 @@ extern const struct language_data c_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&c_varobj_ops,
c_compute_program,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
@ -946,6 +945,16 @@ public:
return c_get_compile_context ();
}
/* See language.h. */
std::string compute_program (compile_instance *inst,
const char *input,
struct gdbarch *gdbarch,
const struct block *expr_block,
CORE_ADDR expr_pc) const override
{
return c_compute_program (inst, input, gdbarch, expr_block, expr_pc);
}
/* See language.h. */
void print_type (struct type *type, const char *varstring,
@ -1025,7 +1034,6 @@ extern const struct language_data cplus_language_data =
c_watch_location_expression,
cp_get_symbol_name_matcher,
&cplus_varobj_ops,
cplus_compute_program,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
@ -1122,6 +1130,16 @@ public:
return cplus_get_compile_context ();
}
/* See language.h. */
std::string compute_program (compile_instance *inst,
const char *input,
struct gdbarch *gdbarch,
const struct block *expr_block,
CORE_ADDR expr_pc) const override
{
return cplus_compute_program (inst, input, gdbarch, expr_block, expr_pc);
}
/* See language.h. */
unsigned int search_name_hash (const char *name) const override
{
@ -1209,7 +1227,6 @@ extern const struct language_data asm_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
@ -1280,7 +1297,6 @@ extern const struct language_data minimal_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

4
gdb/c-lang.h
View File

@ -172,7 +172,7 @@ extern compile_instance *cplus_get_compile_context ();
/* This takes the user-supplied text and returns a new bit of code to
compile.
This is used as the la_compute_program language method; see that
This is used as the compute_program language method; see that
for a description of the arguments. */
extern std::string c_compute_program (compile_instance *inst,
@ -183,7 +183,7 @@ extern std::string c_compute_program (compile_instance *inst,
/* This takes the user-supplied text and returns a new bit of code to compile.
This is used as the la_compute_program language method; see that
This is used as the compute_program language method; see that
for a description of the arguments. */
extern std::string cplus_compute_program (compile_instance *inst,

4
gdb/compile/compile-c-support.c
View File

@ -660,7 +660,7 @@ typedef compile_program<compile_cplus_instance,
cplus_add_code_header, c_add_code_footer,
cplus_add_input> cplus_compile_program;
/* The la_compute_program method for C. */
/* The compute_program method for C. */
std::string
c_compute_program (compile_instance *inst,
@ -675,7 +675,7 @@ c_compute_program (compile_instance *inst,
return program.compute (input, expr_block, expr_pc);
}
/* The la_compute_program method for C++. */
/* The compute_program method for C++. */
std::string
cplus_compute_program (compile_instance *inst,

4
gdb/compile/compile.c
View File

@ -724,8 +724,8 @@ compile_to_object (struct command_line *cmd, const char *cmd_string,
error (_("Neither a simple expression, or a multi-line specified."));
std::string code
= current_language->la_compute_program (compiler.get (), input, gdbarch,
expr_block, expr_pc);
= current_language->compute_program (compiler.get (), input, gdbarch,
expr_block, expr_pc);
if (compile_debug)
fprintf_unfiltered (gdb_stdlog, "debug output:\n\n%s", code.c_str ());

1
gdb/d-lang.c
View File

@ -162,7 +162,6 @@ extern const struct language_data d_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

1
gdb/f-lang.c
View File

@ -622,7 +622,6 @@ extern const struct language_data f_language_data =
c_watch_location_expression,
cp_get_symbol_name_matcher, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
f_is_string_type_p,
"(...)" /* la_struct_too_deep_ellipsis */
};

1
gdb/go-lang.c
View File

@ -547,7 +547,6 @@ extern const struct language_data go_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
go_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

2
gdb/language.c
View File

@ -776,7 +776,6 @@ extern const struct language_data unknown_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
default_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
@ -851,7 +850,6 @@ extern const struct language_data auto_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
default_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

42
gdb/language.h
View File

@ -354,26 +354,6 @@ struct language_data
/* Various operations on varobj. */
const struct lang_varobj_ops *la_varobj_ops;
/* This method must be defined if 'la_get_gcc_context' is defined.
If 'la_get_gcc_context' is not defined, then this method is
ignored.
This takes the user-supplied text and returns a new bit of code
to compile.
INST is the compiler instance being used.
INPUT is the user's input text.
GDBARCH is the architecture to use.
EXPR_BLOCK is the block in which the expression is being
parsed.
EXPR_PC is the PC at which the expression is being parsed. */
std::string (*la_compute_program) (compile_instance *inst,
const char *input,
struct gdbarch *gdbarch,
const struct block *expr_block,
CORE_ADDR expr_pc);
/* Return true if TYPE is a string type. */
bool (*la_is_string_type_p) (struct type *type);
@ -476,6 +456,28 @@ struct language_defn : language_data
return nullptr;
}
/* This method must be overridden if 'get_compile_instance' is
overridden.
This takes the user-supplied text and returns a new bit of code
to compile.
INST is the compiler instance being used.
INPUT is the user's input text.
GDBARCH is the architecture to use.
EXPR_BLOCK is the block in which the expression is being
parsed.
EXPR_PC is the PC at which the expression is being parsed. */
virtual std::string compute_program (compile_instance *inst,
const char *input,
struct gdbarch *gdbarch,
const struct block *expr_block,
CORE_ADDR expr_pc) const
{
gdb_assert_not_reached ("language_defn::compute_program");
}
/* Hash the given symbol search name. */
virtual unsigned int search_name_hash (const char *name) const;

1
gdb/m2-lang.c
View File

@ -381,7 +381,6 @@ extern const struct language_data m2_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
m2_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

1
gdb/objc-lang.c
View File

@ -356,7 +356,6 @@ extern const struct language_data objc_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

1
gdb/opencl-lang.c
View File

@ -1035,7 +1035,6 @@ extern const struct language_data opencl_language_data =
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
c_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

1
gdb/p-lang.c
View File

@ -412,7 +412,6 @@ extern const struct language_data pascal_language_data =
c_watch_location_expression,
NULL, /* la_compare_symbol_for_completion */
&default_varobj_ops,
NULL,
pascal_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};

1
gdb/rust-lang.c
View File

@ -2067,7 +2067,6 @@ extern const struct language_data rust_language_data =
rust_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
&default_varobj_ops,
NULL,
rust_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};