[PATCH 002/203] Split out eval_op_var_entry_value

Tom Tromey
2021-01-01T21:47:32Z

This splits OP_VAR_ENTRY_VALUE into a new function for future use.

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

* eval.c (eval_op_var_entry_value): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 34 +++++++++++++++++++++-------------
2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 74123b0d13f..745333d31f9 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1195,6 +1195,26 @@ eval_op_scope (struct type *expect_type, struct expression *exp,
return arg1;
}

+/* Helper function that implements the body of OP_VAR_ENTRY_VALUE. */
+
+static struct value *
+eval_op_var_entry_value (struct type *expect_type, struct expression *exp,
+ enum noside noside, symbol *sym)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return value_zero (SYMBOL_TYPE (sym), not_lval);
+
+ if (SYMBOL_COMPUTED_OPS (sym) == NULL
+ || SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry == NULL)
+ error (_("Symbol \"%s\" does not have any specific entry value"),
+ sym->print_name ());
+
+ struct frame_info *frame = get_selected_frame (NULL);
+ return SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry (sym, frame);
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -1270,23 +1290,11 @@ evaluate_subexp_standard (struct type *expect_type,

case OP_VAR_ENTRY_VALUE:
(*pos) += 2;
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);

{
struct symbol *sym = exp->elts[pc + 1].symbol;
- struct frame_info *frame;
-
- if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return value_zero (SYMBOL_TYPE (sym), not_lval);
-
- if (SYMBOL_COMPUTED_OPS (sym) == NULL
- || SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry == NULL)
- error (_("Symbol \"%s\" does not have any specific entry value"),
- sym->print_name ());

- frame = get_selected_frame (NULL);
- return SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry (sym, frame);
+ return eval_op_var_entry_value (expect_type, exp, noside, sym);
}

case OP_FUNC_STATIC_VAR:
--
2.26.2