MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split out eval_op_preinc

Browse Source 
This splits UNOP_PREINCREMENT into a new function for future use.

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

	* eval.c (eval_op_preinc): New function.
	(evaluate_subexp_standard): Use it.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent 3aef2a0768
commit 00f508843c
2 changed files with 37 additions and 21 deletions
Show Stats 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_preinc): New function.
(evaluate_subexp_standard): Use it.
2021-03-08 Tom Tromey <tom@tromey.com> 2021-03-08 Tom Tromey <tom@tromey.com>
* eval.c (eval_op_memval): New function. * eval.c (eval_op_memval): New function.

53
gdb/eval.c
View File

@ -1909,6 +1909,37 @@ eval_op_memval (struct type *expect_type, struct expression *exp,
return value_at_lazy (type, value_as_address (arg1)); return value_at_lazy (type, value_as_address (arg1));
} }
/* A helper function for UNOP_PREINCREMENT. */
static struct value *
eval_op_preinc (struct type *expect_type, struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1)
{
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
return arg1;
else if (unop_user_defined_p (op, arg1))
{
return value_x_unop (arg1, op, noside);
}
else
{
struct value *arg2;
if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
arg2 = value_ptradd (arg1, 1);
else
{
struct value *tmp = arg1;
arg2 = value_one (value_type (arg1));
binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
arg2 = value_binop (tmp, arg2, BINOP_ADD);
}
return value_assign (arg1, arg2);
}
}
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,
@ -2843,27 +2874,7 @@ evaluate_subexp_standard (struct type *expect_type,
case UNOP_PREINCREMENT: case UNOP_PREINCREMENT:
arg1 = evaluate_subexp (expect_type, exp, pos, noside); arg1 = evaluate_subexp (expect_type, exp, pos, noside);
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) return eval_op_preinc (expect_type, exp, noside, op, arg1);
return arg1;
else if (unop_user_defined_p (op, arg1))
{
return value_x_unop (arg1, op, noside);
}
else
{
if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
arg2 = value_ptradd (arg1, 1);
else
{
struct value *tmp = arg1;
arg2 = value_one (value_type (arg1));
binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
arg2 = value_binop (tmp, arg2, BINOP_ADD);
}
return value_assign (arg1, arg2);
}
case UNOP_PREDECREMENT: case UNOP_PREDECREMENT:
arg1 = evaluate_subexp (expect_type, exp, pos, noside); arg1 = evaluate_subexp (expect_type, exp, pos, noside);