[PATCH 094/203] Introduce structop_ptr_operation

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

This adds class structop_ptr_operation, which implements STRUCTOP_PTR.

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

* expop.h (class structop_ptr_operation): New.
* eval.c (eval_op_structop_ptr): No longer static. Remove "op"
parameter.
---
gdb/ChangeLog | 6 ++++++
gdb/eval.c | 10 +++++-----
gdb/expop.h | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 2da1cf5fdbc..156ef8530ce 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1343,9 +1343,9 @@ eval_op_structop_struct (struct type *expect_type, struct expression *exp,

/* A helper function for STRUCTOP_PTR. */

-static struct value *
+struct value *
eval_op_structop_ptr (struct type *expect_type, struct expression *exp,
- enum noside noside, enum exp_opcode op,
+ enum noside noside,
struct value *arg1, const char *string)
{
if (noside == EVAL_SKIP)
@@ -1353,12 +1353,12 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp,

/* Check to see if operator '->' has been overloaded. If so replace
arg1 with the value returned by evaluating operator->(). */
- while (unop_user_defined_p (op, arg1))
+ while (unop_user_defined_p (STRUCTOP_PTR, arg1))
{
struct value *value = NULL;
try
{
- value = value_x_unop (arg1, op, noside);
+ value = value_x_unop (arg1, STRUCTOP_PTR, noside);
}

catch (const gdb_exception_error &except)
@@ -2734,7 +2734,7 @@ evaluate_subexp_standard (struct type *expect_type,
tem = longest_to_int (exp->elts[pc + 1].longconst);
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- return eval_op_structop_ptr (expect_type, exp, noside, op, arg1,
+ return eval_op_structop_ptr (expect_type, exp, noside, arg1,
&exp->elts[pc + 2].string);

case STRUCTOP_MEMBER:
diff --git a/gdb/expop.h b/gdb/expop.h
index c629614f5f1..85d2eaf063a 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -74,6 +74,11 @@ extern struct value *eval_op_structop_struct (struct type *expect_type,
enum noside noside,
struct value *arg1,
const char *string);
+extern struct value *eval_op_structop_ptr (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ struct value *arg1,
+ const char *string);

namespace expr
{
@@ -837,6 +842,40 @@ class structop_operation
}
};

+class structop_ptr_operation
+ : public structop_base_operation
+{
+public:
+
+ using structop_base_operation::structop_base_operation;
+
+ value *evaluate (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside) override
+ {
+ value *val = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+ return eval_op_structop_ptr (expect_type, exp, noside, val,
+ std::get<1> (m_storage).c_str ());
+ }
+
+ enum exp_opcode opcode () const override
+ { return STRUCTOP_PTR; }
+
+protected:
+
+ void do_generate_ax (struct expression *exp,
+ struct agent_expr *ax,
+ struct axs_value *value,
+ struct type *cast_type)
+ override
+ {
+ gen_expr_structop (exp, STRUCTOP_PTR,
+ std::get<0> (this->m_storage).get (),
+ std::get<1> (this->m_storage).c_str (),
+ ax, value);
+ }
+};
+
} /* namespace expr */

#endif /* EXPOP_H */
--
2.26.2