[PATCH 162/203] Refactor value_pos_atr

Tom Tromey
2021-01-01T21:49:25Z

This refactors value_pos_atr to be directly usable by a new operation
implementation.

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

* ada-lang.c (ada_pos_atr): Rename from value_pos_atr. Change
parameters.
(ada_evaluate_subexp): Use it.
---
gdb/ChangeLog | 6 ++++++
gdb/ada-lang.c | 16 ++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index b3278183177..4a83e9f57a5 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -191,8 +191,6 @@ static struct value *ada_coerce_ref (struct value *);

static LONGEST pos_atr (struct value *);

-static struct value *value_pos_atr (struct type *, struct value *);
-
static struct value *val_atr (struct type *, LONGEST);

static struct symbol *standard_lookup (const char *, const struct block *,
@@ -8963,8 +8961,14 @@ pos_atr (struct value *arg)
}

static struct value *
-value_pos_atr (struct type *type, struct value *arg)
+ada_pos_atr (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg)
{
+ struct type *type = builtin_type (exp->gdbarch)->builtin_int;
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return value_zero (type, not_lval);
return value_from_longest (type, pos_atr (arg));
}

@@ -11373,11 +11377,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
if (noside == EVAL_SKIP)
goto nosideret;
- type = builtin_type (exp->gdbarch)->builtin_int;
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return value_zero (type, not_lval);
- else
- return value_pos_atr (type, arg1);
+ return ada_pos_atr (expect_type, exp, noside, op, arg1);

case OP_ATR_SIZE:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
--
2.26.2