[PATCH 062/203] Split out ada_abs

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

This splits UNOP_ABS into a new function for future use.

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

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

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 203648ade02..a1468b81e05 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10201,6 +10201,21 @@ ada_atr_size (struct type *expect_type,
TARGET_CHAR_BIT * TYPE_LENGTH (type));
}

+/* A helper function for UNOP_ABS. */
+
+static value *
+ada_abs (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1)
+{
+ unop_promote (exp->language_defn, exp->gdbarch, &arg1);
+ if (value_less (arg1, value_zero (value_type (arg1), not_lval)))
+ return value_neg (arg1);
+ else
+ return arg1;
+}
+
/* Implement the evaluate_exp routine in the exp_descriptor structure
for the Ada language. */

@@ -11025,11 +11040,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
if (noside == EVAL_SKIP)
goto nosideret;
- unop_promote (exp->language_defn, exp->gdbarch, &arg1);
- if (value_less (arg1, value_zero (value_type (arg1), not_lval)))
- return value_neg (arg1);
- else
- return arg1;
+ return ada_abs (expect_type, exp, noside, op, arg1);

case UNOP_IND:
preeval_pos = *pos;
--
2.26.2