From dd5fd28346863006668d3a04957f7b066f3b8b2a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out ada_binop_exp This splits BINOP_EXP into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * ada-lang.c (ada_binop_exp): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 924497ea9e5..2ac0fe7847d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * ada-lang.c (ada_binop_exp): New function. + (ada_evaluate_subexp): Use it. + 2021-03-08 Tom Tromey * ada-lang.c (ada_val_atr): Rename from value_val_atr. Change diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 910eec87a6a..be1827cedd8 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10364,6 +10364,29 @@ ada_binop_minmax (struct type *expect_type, } } +/* A helper function for BINOP_EXP. */ + +static struct value * +ada_binop_exp (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (value_type (arg1), not_lval); + else + { + /* For integer exponentiation operations, + only promote the first argument. */ + if (is_integral_type (value_type (arg2))) + unop_promote (exp->language_defn, exp->gdbarch, &arg1); + else + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + + return value_binop (arg1, arg2, op); + } +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ @@ -10926,19 +10949,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, arg2 = evaluate_subexp (nullptr, exp, pos, noside); if (noside == EVAL_SKIP) goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (value_type (arg1), not_lval); - else - { - /* For integer exponentiation operations, - only promote the first argument. */ - if (is_integral_type (value_type (arg2))) - unop_promote (exp->language_defn, exp->gdbarch, &arg1); - else - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - - return value_binop (arg1, arg2, op); - } + return ada_binop_exp (expect_type, exp, noside, op, arg1, arg2); case UNOP_PLUS: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.30.2