espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-04 13:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove eval_op_string

Browse Source 
eval_op_string is only used in a single place -- the implementation of
string_operation.  This patch turns it into the
string_operation::evaluate method, removing a bit of extraneous code.
This commit is contained in:
Tom Tromey
2022-03-08 09:47:39 -07:00
parent 879f2aae39
commit 16b6c36154
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gdb/eval.c
View File

@ -1078,17 +1078,22 @@ eval_op_register (struct type *expect_type, struct expression *exp,
return val; return val;
} }
/* Helper function that implements the body of OP_STRING. */ namespace expr
struct value *
eval_op_string (struct type *expect_type, struct expression *exp,
enum noside noside, int len, const char *string)
{ {
value *
string_operation::evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside)
{
const std::string &str = std::get<0> (m_storage);
struct type *type = language_string_char_type (exp->language_defn, struct type *type = language_string_char_type (exp->language_defn,
exp->gdbarch); exp->gdbarch);
return value_string (string, len, type); return value_string (str.c_str (), str.size (), type);
} }
} /* namespace expr */
/* Helper function that implements the body of OP_OBJC_SELECTOR. */ /* Helper function that implements the body of OP_OBJC_SELECTOR. */
struct value * struct value *

11
gdb/expop.h
View File

@ -64,10 +64,6 @@ extern struct value *eval_op_func_static_var (struct type *expect_type,
extern struct value *eval_op_register (struct type *expect_type, extern struct value *eval_op_register (struct type *expect_type,
struct expression *exp, struct expression *exp,
enum noside noside, const char *name); enum noside noside, const char *name);
extern struct value *eval_op_string (struct type *expect_type,
struct expression *exp,
enum noside noside, int len,
const char *string);
extern struct value *eval_op_ternop (struct type *expect_type, extern struct value *eval_op_ternop (struct type *expect_type,
struct expression *exp, struct expression *exp,
enum noside noside, enum noside noside,
@ -912,12 +908,7 @@ public:
value *evaluate (struct type *expect_type, value *evaluate (struct type *expect_type,
struct expression *exp, struct expression *exp,
enum noside noside) override enum noside noside) override;
{
const std::string &str = std::get<0> (m_storage);
return eval_op_string (expect_type, exp, noside,
str.size (), str.c_str ());
}
enum exp_opcode opcode () const override enum exp_opcode opcode () const override
{ return OP_STRING; } { return OP_STRING; }