From 9e1361b760285542dd3826e1425261ea277ea10c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out eval_op_predec This splits UNOP_PREDECREMENT into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * eval.c (eval_op_predec): New file. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 53 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 579e3482b77..7835dd6fc79 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * eval.c (eval_op_predec): New file. + (evaluate_subexp_standard): Use it. + 2021-03-08 Tom Tromey * eval.c (eval_op_preinc): New function. diff --git a/gdb/eval.c b/gdb/eval.c index 58c8192da84..a9589469645 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1940,6 +1940,37 @@ eval_op_preinc (struct type *expect_type, struct expression *exp, } } +/* A helper function for UNOP_PREDECREMENT. */ + +static struct value * +eval_op_predec (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 *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); + } + + return value_assign (arg1, arg2); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2878,27 +2909,7 @@ evaluate_subexp_standard (struct type *expect_type, case UNOP_PREDECREMENT: 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 - { - 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); - } - - return value_assign (arg1, arg2); - } + return eval_op_predec (expect_type, exp, noside, op, arg1); case UNOP_POSTINCREMENT: arg1 = evaluate_subexp (expect_type, exp, pos, noside); -- 2.30.2