From fb5ba2ab26ffcc00d11c2540685617ef3f29c6b2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out eval_binop_assign_modify This splits BINOP_ASSIGN_MODIFY into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * eval.c (eval_binop_assign_modify): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 ++++ gdb/eval.c | 65 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8ee6f5cc593..9b4c9c80b6b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * eval.c (eval_binop_assign_modify): New function. + (evaluate_subexp_standard): Use it. + 2021-03-08 Tom Tromey * m2-lang.c (eval_op_m2_subscript): New function. diff --git a/gdb/eval.c b/gdb/eval.c index def12208883..78a10f741f0 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2053,6 +2053,42 @@ eval_op_type (struct type *expect_type, struct expression *exp, error (_("Attempt to use a type name as an expression")); } +/* A helper function for BINOP_ASSIGN_MODIFY. */ + +static struct value * +eval_binop_assign_modify (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + return arg1; + if (binop_user_defined_p (op, arg1, arg2)) + return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); + else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn, + value_type (arg1)) + && is_integral_type (value_type (arg2))) + arg2 = value_ptradd (arg1, value_as_long (arg2)); + else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn, + value_type (arg1)) + && is_integral_type (value_type (arg2))) + arg2 = value_ptradd (arg1, - value_as_long (arg2)); + else + { + struct value *tmp = arg1; + + /* For shift and integer exponentiation operations, + only promote the first argument. */ + if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP) + && is_integral_type (value_type (arg2))) + unop_promote (exp->language_defn, exp->gdbarch, &tmp); + else + binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); + + arg2 = value_binop (tmp, arg2, op); + } + return value_assign (arg1, arg2); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2706,34 +2742,9 @@ evaluate_subexp_standard (struct type *expect_type, (*pos) += 2; arg1 = evaluate_subexp (nullptr, exp, pos, noside); arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; op = exp->elts[pc + 1].opcode; - if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); - else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn, - value_type (arg1)) - && is_integral_type (value_type (arg2))) - arg2 = value_ptradd (arg1, value_as_long (arg2)); - else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn, - value_type (arg1)) - && is_integral_type (value_type (arg2))) - arg2 = value_ptradd (arg1, - value_as_long (arg2)); - else - { - struct value *tmp = arg1; - - /* For shift and integer exponentiation operations, - only promote the first argument. */ - if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP) - && is_integral_type (value_type (arg2))) - unop_promote (exp->language_defn, exp->gdbarch, &tmp); - else - binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); - - arg2 = value_binop (tmp, arg2, op); - } - return value_assign (arg1, arg2); + return eval_binop_assign_modify (expect_type, exp, noside, op, + arg1, arg2); case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside);