[PATCH 021/203] Split out eval_op_gtr

Tom Tromey
2021-01-01T21:47:44Z

This splits BINOP_GTR into a new function for future use.

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

* eval.c (eval_op_gtr): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 37 ++++++++++++++++++++++++-------------
2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 801cddcd311..3b702d3a3e6 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1645,6 +1645,29 @@ eval_op_less (struct type *expect_type, struct expression *exp,
}
}

+/* A helper function for BINOP_GTR. */
+
+static 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)
+{
+ 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);
+ }
+ else
+ {
+ binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
+ int tem = value_less (arg2, arg1);
+ struct type *type = language_bool_type (exp->language_defn,
+ exp->gdbarch);
+ return value_from_longest (type, (LONGEST) tem);
+ }
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -2471,19 +2494,7 @@ evaluate_subexp_standard (struct type *expect_type,
case BINOP_GTR:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
- 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);
- }
- else
- {
- binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
- tem = value_less (arg2, arg1);
- type = language_bool_type (exp->language_defn, exp->gdbarch);
- return value_from_longest (type, (LONGEST) tem);
- }
+ return eval_op_gtr (expect_type, exp, noside, op, arg1, arg2);

case BINOP_GEQ:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
--
2.26.2