From 07f724a8c604cdfa1639f757e577dd6eb9caed25 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Introduce structop_member_operation and structop_mptr_operation This adds class structop_member_operation and structop_mptr_operation, which implement STRUCTOP_MEMBER and STRUCTOP_MPTR. gdb/ChangeLog 2021-03-08 Tom Tromey * expop.h (class structop_member_operation) (class structop_mptr_operation): New. * eval.c (eval_op_member): No longer static. --- gdb/ChangeLog | 6 ++++++ gdb/eval.c | 2 +- gdb/expop.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0a985a2fce5..42a8e1c8f88 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-03-08 Tom Tromey + + * expop.h (class structop_member_operation) + (class structop_mptr_operation): New. + * eval.c (eval_op_member): No longer static. + 2021-03-08 Tom Tromey * expop.h (class structop_ptr_operation): New. diff --git a/gdb/eval.c b/gdb/eval.c index 1962777cc6d..de7863138b3 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1417,7 +1417,7 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp, /* A helper function for STRUCTOP_MEMBER. */ -static struct value * +struct value * eval_op_member (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) diff --git a/gdb/expop.h b/gdb/expop.h index 38f3ffb5aef..cbd4d6267da 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -80,6 +80,10 @@ extern struct value *eval_op_structop_ptr (struct type *expect_type, enum noside noside, struct value *arg1, const char *string); +extern struct value *eval_op_member (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2); namespace expr { @@ -887,6 +891,50 @@ protected: } }; +class structop_member_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs + = std::get<0> (m_storage)->evaluate_for_address (exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_member (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_MEMBER; } +}; + +class structop_mptr_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs + = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_member (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_MPTR; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.30.2