From aedaf9ac06d60186e2b593ee468179f8132a2510 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_add This splits BINOP_ADD into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * eval.c (eval_op_add): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 40 +++++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a0a98b99cb9..674f1765df1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * eval.c (eval_op_add): New function. + (evaluate_subexp_standard): Use it. + 2021-03-08 Tom Tromey * eval.c (eval_op_member): New function. diff --git a/gdb/eval.c b/gdb/eval.c index d609b737a59..4152c34a2d2 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1456,6 +1456,30 @@ eval_op_member (struct type *expect_type, struct expression *exp, } } +/* A helper function for BINOP_ADD. */ + +static struct value * +eval_op_add (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 if (ptrmath_type_p (exp->language_defn, value_type (arg1)) + && is_integral_or_integral_reference (value_type (arg2))) + return value_ptradd (arg1, value_as_long (arg2)); + else if (ptrmath_type_p (exp->language_defn, value_type (arg2)) + && is_integral_or_integral_reference (value_type (arg1))) + return value_ptradd (arg2, value_as_long (arg1)); + else + { + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + return value_binop (arg1, arg2, BINOP_ADD); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2142,21 +2166,7 @@ evaluate_subexp_standard (struct type *expect_type, case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (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 if (ptrmath_type_p (exp->language_defn, value_type (arg1)) - && is_integral_or_integral_reference (value_type (arg2))) - return value_ptradd (arg1, value_as_long (arg2)); - else if (ptrmath_type_p (exp->language_defn, value_type (arg2)) - && is_integral_or_integral_reference (value_type (arg1))) - return value_ptradd (arg2, value_as_long (arg1)); - else - { - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - return value_binop (arg1, arg2, BINOP_ADD); - } + return eval_op_add (expect_type, exp, noside, op, arg1, arg2); case BINOP_SUB: arg1 = evaluate_subexp_with_coercion (exp, pos, noside);