[PATCH 063/203] Split out ada_mult_binop

Tom Tromey
2021-01-01T21:48:10Z

This splits BINOP_MUL into a new function for future use.

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

* ada-lang.c (ada_mult_binop): New function.
(ada_evaluate_subexp): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/ada-lang.c | 42 +++++++++++++++++++++++++++---------------
2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index a1468b81e05..f096157881a 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10216,6 +10216,31 @@ ada_abs (struct type *expect_type,
return arg1;
}

+/* A helper function for BINOP_MUL. */
+
+static value *
+ada_mult_binop (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)
+ {
+ binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
+ return value_zero (value_type (arg1), not_lval);
+ }
+ else
+ {
+ struct type *type = builtin_type (exp->gdbarch)->builtin_double;
+ if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1)))
+ arg1 = cast_from_gnat_encoded_fixed_point_type (type, arg1);
+ if (ada_is_gnat_encoded_fixed_point_type (value_type (arg2)))
+ arg2 = cast_from_gnat_encoded_fixed_point_type (type, arg2);
+ binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
+ return ada_value_binop (arg1, arg2, op);
+ }
+}
+
/* Implement the evaluate_exp routine in the exp_descriptor structure
for the Ada language. */

@@ -10374,21 +10399,8 @@ 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)
- {
- binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
- return value_zero (value_type (arg1), not_lval);
- }
- else
- {
- type = builtin_type (exp->gdbarch)->builtin_double;
- if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1)))
- arg1 = cast_from_gnat_encoded_fixed_point_type (type, arg1);
- if (ada_is_gnat_encoded_fixed_point_type (value_type (arg2)))
- arg2 = cast_from_gnat_encoded_fixed_point_type (type, arg2);
- binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
- return ada_value_binop (arg1, arg2, op);
- }
+ return ada_mult_binop (expect_type, exp, noside, op,
+ arg1, arg2);

case BINOP_EQUAL:
case BINOP_NOTEQUAL:
--
2.26.2