yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce concat_operation

Browse Source 
This adds class concat_operation, which implements BINOP_CONCAT.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* expop.h (class concat_operation): New.
	* eval.c (eval_op_concat): No longer static.  Remove "op"
	parameter.
	(evaluate_subexp_standard): Update.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent 07f724a8c6
commit e51e26a090
3 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* expop.h (class concat_operation): New.
* eval.c (eval_op_concat): No longer static. Remove "op"
parameter.
(evaluate_subexp_standard): Update.
2021-03-08 Tom Tromey <tom@tromey.com>
* expop.h (class structop_member_operation)

11
gdb/eval.c
View File

@ -1313,15 +1313,14 @@ eval_op_objc_selector (struct type *expect_type, struct expression *exp,
/* Helper function that implements the body of BINOP_CONCAT. */
static struct value *
struct value *
eval_op_concat (struct type *expect_type, struct expression *exp,
enum noside noside,
enum exp_opcode op, struct value *arg1, struct value *arg2)
enum noside noside, struct value *arg1, struct value *arg2)
{
if (noside == EVAL_SKIP)
return eval_skip_value (exp);
if (binop_user_defined_p (op, arg1, arg2))
return value_x_binop (arg1, arg2, op, OP_NULL, noside);
if (binop_user_defined_p (BINOP_CONCAT, arg1, arg2))
return value_x_binop (arg1, arg2, BINOP_CONCAT, OP_NULL, noside);
else
return value_concat (arg1, arg2);
}
@ -2791,7 +2790,7 @@ evaluate_subexp_standard (struct type *expect_type,
case BINOP_CONCAT:
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
return eval_op_concat (expect_type, exp, noside, op, arg1, arg2);
return eval_op_concat (expect_type, exp, noside, arg1, arg2);
case BINOP_ASSIGN:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);

26
gdb/expop.h
View File

@ -84,6 +84,10 @@ extern struct value *eval_op_member (struct type *expect_type,
struct expression *exp,
enum noside noside,
struct value *arg1, struct value *arg2);
extern struct value *eval_op_concat (struct type *expect_type,
struct expression *exp,
enum noside noside,
struct value *arg1, struct value *arg2);
namespace expr
{
@ -935,6 +939,28 @@ public:
{ return STRUCTOP_MPTR; }
};
class concat_operation
: public maybe_constant_operation<operation_up, operation_up>
{
public:
using maybe_constant_operation::maybe_constant_operation;
value *evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside) override
{
value *lhs
= std::get<0> (m_storage)->evaluate_with_coercion (exp, noside);
value *rhs
= std::get<1> (m_storage)->evaluate_with_coercion (exp, noside);
return eval_op_concat (expect_type, exp, noside, lhs, rhs);
}
enum exp_opcode opcode () const override
{ return BINOP_CONCAT; }
};
} /* namespace expr */
#endif /* EXPOP_H */