[PATCH 101/203] Implement binary comparison operations

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

This implements the binary comparison operations via a template class.

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

* expop.h (class comparison_operation): New.
(equal_operation, notequal_operation, less_operation)
(gtr_operation, geq_operation, leq_operation): New typedefs.
* eval.c (eval_op_equal, eval_op_notequal, eval_op_less)
(eval_op_gtr, eval_op_geq, eval_op_leq): No longer static.
---
gdb/ChangeLog | 8 +++++++
gdb/eval.c | 12 +++++------
gdb/expop.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index e67842dea57..e9c4a1fffd0 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1579,7 +1579,7 @@ eval_op_subscript (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_EQUAL. */

-static struct value *
+struct value *
eval_op_equal (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
@@ -1602,7 +1602,7 @@ eval_op_equal (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_NOTEQUAL. */

-static struct value *
+struct value *
eval_op_notequal (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
@@ -1625,7 +1625,7 @@ eval_op_notequal (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_LESS. */

-static struct value *
+struct value *
eval_op_less (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
@@ -1648,7 +1648,7 @@ eval_op_less (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_GTR. */

-static struct value *
+struct value *
eval_op_gtr (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
@@ -1671,7 +1671,7 @@ eval_op_gtr (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_GEQ. */

-static struct value *
+struct value *
eval_op_geq (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
@@ -1694,7 +1694,7 @@ eval_op_geq (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_LEQ. */

-static struct value *
+struct value *
eval_op_leq (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
diff --git a/gdb/expop.h b/gdb/expop.h
index 556ceaa1e87..27264562a4e 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -104,6 +104,36 @@ extern struct value *eval_op_subscript (struct type *expect_type,
enum noside noside, enum exp_opcode op,
struct value *arg1,
struct value *arg2);
+extern struct value *eval_op_equal (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);
+extern struct value *eval_op_notequal (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);
+extern struct value *eval_op_less (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);
+extern struct value *eval_op_gtr (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);
+extern struct value *eval_op_geq (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);
+extern struct value *eval_op_leq (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);

namespace expr
{
@@ -1117,6 +1147,36 @@ class subscript_operation
enum noside noside) override;
};

+/* Implementation of comparison operations. */
+template<enum exp_opcode OP, binary_ftype FUNC>
+class comparison_operation
+ : public usual_ax_binop_operation<OP, FUNC>
+{
+public:
+
+ using usual_ax_binop_operation<OP, FUNC>::usual_ax_binop_operation;
+
+ value *evaluate (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside) override
+ {
+ value *lhs
+ = std::get<0> (this->m_storage)->evaluate (nullptr, exp, noside);
+ value *rhs
+ = std::get<1> (this->m_storage)->evaluate (value_type (lhs), exp,
+ noside);
+ return FUNC (expect_type, exp, noside, OP, lhs, rhs);
+ }
+};
+
+using equal_operation = comparison_operation<BINOP_EQUAL, eval_op_equal>;
+using notequal_operation
+ = comparison_operation<BINOP_NOTEQUAL, eval_op_notequal>;
+using less_operation = comparison_operation<BINOP_LESS, eval_op_less>;
+using gtr_operation = comparison_operation<BINOP_GTR, eval_op_gtr>;
+using geq_operation = comparison_operation<BINOP_GEQ, eval_op_geq>;
+using leq_operation = comparison_operation<BINOP_LEQ, eval_op_leq>;
+
} /* namespace expr */

#endif /* EXPOP_H */
--
2.26.2