[PATCH 004/203] Split out eval_op_func_static_var

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

This splits OP_FUNC_STATIC_VAR into a new function for future use.

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

* eval.c (eval_op_func_static_var): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 27 +++++++++++++++++----------
2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index e896baa3dec..5312525e850 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1229,6 +1229,21 @@ eval_op_var_msym_value (struct type *expect_type, struct expression *exp,
return val;
}

+static struct value *
+eval_op_func_static_var (struct type *expect_type, struct expression *exp,
+ enum noside noside,
+ value *func, const char *var)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ CORE_ADDR addr = value_address (func);
+ const block *blk = block_for_pc (addr);
+ struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL);
+ if (sym.symbol == NULL)
+ error (_("No symbol \"%s\" in specified context."), var);
+ return evaluate_var_value (noside, sym.block, sym.symbol);
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -1313,17 +1328,9 @@ evaluate_subexp_standard (struct type *expect_type,

{
value *func = evaluate_subexp_standard (NULL, exp, pos, noside);
- CORE_ADDR addr = value_address (func);
-
- const block *blk = block_for_pc (addr);
- const char *var = &exp->elts[pc + 2].string;
-
- struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL);
-
- if (sym.symbol == NULL)
- error (_("No symbol \"%s\" in specified context."), var);

- return evaluate_var_value (noside, sym.block, sym.symbol);
+ return eval_op_func_static_var (expect_type, exp, noside, func,
+ &exp->elts[pc + 2].string);
}

case OP_LAST:
--
2.26.2