FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split out eval_op_scope

Browse source 
This splits OP_SCOPE into a new function for future use.

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

	* eval.c (eval_op_scope): New function.
	(evaluate_subexp_standard): Use it.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent 8c9b6e7689
commit ea2d29f7bc
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* eval.c (eval_op_scope): New function.
(evaluate_subexp_standard): Use it.
2021-03-06 Chernov Sergey <klen_s@mail.ru> 2021-03-06 Chernov Sergey <klen_s@mail.ru>
PR gdb/27528: PR gdb/27528:

27
gdb/eval.c
View file

@ -1182,6 +1182,22 @@ is_integral_or_integral_reference (struct type *type)
&& is_integral_type (TYPE_TARGET_TYPE (type))); && is_integral_type (TYPE_TARGET_TYPE (type)));
} }
/* Helper function that implements the body of OP_SCOPE. */
static struct value *
eval_op_scope (struct type *expect_type, struct expression *exp,
enum noside noside,
struct type *type, const char *string)
{
if (noside == EVAL_SKIP)
return eval_skip_value (exp);
struct value *arg1 = value_aggregate_elt (type, string, expect_type,
0, noside);
if (arg1 == NULL)
error (_("There is no field named %s"), string);
return arg1;
}
struct value * struct value *
evaluate_subexp_standard (struct type *expect_type, evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos, struct expression *exp, int *pos,
@ -1208,14 +1224,9 @@ evaluate_subexp_standard (struct type *expect_type,
case OP_SCOPE: case OP_SCOPE:
tem = longest_to_int (exp->elts[pc + 2].longconst); tem = longest_to_int (exp->elts[pc + 2].longconst);
(*pos) += 4 + BYTES_TO_EXP_ELEM (tem + 1); (*pos) += 4 + BYTES_TO_EXP_ELEM (tem + 1);
if (noside == EVAL_SKIP) return eval_op_scope (expect_type, exp, noside,
return eval_skip_value (exp); exp->elts[pc + 1].type,
arg1 = value_aggregate_elt (exp->elts[pc + 1].type, &exp->elts[pc + 3].string);
&exp->elts[pc + 3].string,
expect_type, 0, noside);
if (arg1 == NULL)
error (_("There is no field named %s"), &exp->elts[pc + 3].string);
return arg1;
case OP_LONG: case OP_LONG:
(*pos) += 3; (*pos) += 3;