[PATCH 035/203] Split out eval_op_postdec

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

This splits UNOP_POSTDECREMENT into a new function for future use.

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

* eval.c (eval_op_postdec): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 60 ++++++++++++++++++++++++++++++---------------------
2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 82215d32d0d..fb9be4e6838 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1980,6 +1980,40 @@ eval_op_postinc (struct type *expect_type, struct expression *exp,
}
}

+/* A helper function for UNOP_POSTDECREMENT. */
+
+static struct value *
+eval_op_postdec (struct type *expect_type, struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1)
+{
+ if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+ return arg1;
+ else if (unop_user_defined_p (op, arg1))
+ {
+ return value_x_unop (arg1, op, noside);
+ }
+ else
+ {
+ struct value *arg3 = value_non_lval (arg1);
+ struct value *arg2;
+
+ if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
+ arg2 = value_ptradd (arg1, -1);
+ else
+ {
+ struct value *tmp = arg1;
+
+ arg2 = value_one (value_type (arg1));
+ binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
+ arg2 = value_binop (tmp, arg2, BINOP_SUB);
+ }
+
+ value_assign (arg1, arg2);
+ return arg3;
+ }
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -1990,7 +2024,6 @@ evaluate_subexp_standard (struct type *expect_type,
int pc, oldpos;
struct value *arg1 = NULL;
struct value *arg2 = NULL;
- struct value *arg3;
struct type *type;
int nargs;
struct value **argvec;
@@ -2926,30 +2959,7 @@ evaluate_subexp_standard (struct type *expect_type,

case UNOP_POSTDECREMENT:
arg1 = evaluate_subexp (expect_type, exp, pos, noside);
- if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
- return arg1;
- else if (unop_user_defined_p (op, arg1))
- {
- return value_x_unop (arg1, op, noside);
- }
- else
- {
- arg3 = value_non_lval (arg1);
-
- if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
- arg2 = value_ptradd (arg1, -1);
- else
- {
- struct value *tmp = arg1;
-
- arg2 = value_one (value_type (arg1));
- binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
- arg2 = value_binop (tmp, arg2, BINOP_SUB);
- }
-
- value_assign (arg1, arg2);
- return arg3;
- }
+ return eval_op_postdec (expect_type, exp, noside, op, arg1);

case OP_THIS:
(*pos) += 1;
--
2.26.2