[PATCH 097/203] Introduce add_operation

Tom Tromey
2021-01-01T21:48:38Z

This adds class add_operation, which implements BINOP_ADD.

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

* expop.h (class add_operation): New.
* eval.c (eval_op_add): No longer static. Remove "op" parameter.
(evaluate_subexp_standard): Update.
---
gdb/ChangeLog | 6 ++++++
gdb/eval.c | 10 +++++-----
gdb/expop.h | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 3942e4afaf2..305143134c5 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1444,15 +1444,15 @@ eval_op_member (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_ADD. */

-static struct value *
+struct value *
eval_op_add (struct type *expect_type, struct expression *exp,
- enum noside noside, enum exp_opcode op,
+ 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_ADD, arg1, arg2))
+ return value_x_binop (arg1, arg2, BINOP_ADD, OP_NULL, noside);
else if (ptrmath_type_p (exp->language_defn, value_type (arg1))
&& is_integral_or_integral_reference (value_type (arg2)))
return value_ptradd (arg1, value_as_long (arg2));
@@ -2797,7 +2797,7 @@ evaluate_subexp_standard (struct type *expect_type,
case BINOP_ADD:
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
- return eval_op_add (expect_type, exp, noside, op, arg1, arg2);
+ return eval_op_add (expect_type, exp, noside, arg1, arg2);

case BINOP_SUB:
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
diff --git a/gdb/expop.h b/gdb/expop.h
index 9b7119b9e92..a571a262775 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -87,6 +87,10 @@ extern struct value *eval_op_concat (struct type *expect_type,
struct expression *exp,
enum noside noside,
struct value *arg1, struct value *arg2);
+extern struct value *eval_op_add (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ struct value *arg1, struct value *arg2);

namespace expr
{
@@ -950,6 +954,42 @@ class concat_operation
{ return BINOP_CONCAT; }
};

+class add_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_add (expect_type, exp, noside, lhs, rhs);
+ }
+
+ enum exp_opcode opcode () const override
+ { return BINOP_ADD; }
+
+protected:
+
+ void do_generate_ax (struct expression *exp,
+ struct agent_expr *ax,
+ struct axs_value *value,
+ struct type *cast_type)
+ override
+ {
+ gen_expr_binop (exp, BINOP_ADD,
+ std::get<0> (this->m_storage).get (),
+ std::get<1> (this->m_storage).get (),
+ ax, value);
+ }
+};
+
} /* namespace expr */

#endif /* EXPOP_H */
--
2.26.2