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

Split out ada_mult_binop

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

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

	* ada-lang.c (ada_mult_binop): New function.
	(ada_evaluate_subexp): Use it.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent d05e24e61a
commit faa1dfd751
2 changed files with 27 additions and 11 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>
* ada-lang.c (ada_mult_binop): New function.
(ada_evaluate_subexp): Use it.
2021-03-08 Tom Tromey <tom@tromey.com> 2021-03-08 Tom Tromey <tom@tromey.com>
* ada-lang.c (ada_abs): New function. * ada-lang.c (ada_abs): New function.

33
gdb/ada-lang.c
View file

@ -10065,6 +10065,26 @@ ada_abs (struct type *expect_type,
return arg1; return arg1;
} }
/* A helper function for BINOP_MUL. */
static value *
ada_mult_binop (struct type *expect_type,
struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2)
{
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
return value_zero (value_type (arg1), not_lval);
}
else
{
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
return ada_value_binop (arg1, arg2, op);
}
}
/* Implement the evaluate_exp routine in the exp_descriptor structure /* Implement the evaluate_exp routine in the exp_descriptor structure
for the Ada language. */ for the Ada language. */
@ -10223,17 +10243,8 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
arg2 = evaluate_subexp (nullptr, exp, pos, noside); arg2 = evaluate_subexp (nullptr, exp, pos, noside);
if (noside == EVAL_SKIP) if (noside == EVAL_SKIP)
goto nosideret; goto nosideret;
else if (noside == EVAL_AVOID_SIDE_EFFECTS) return ada_mult_binop (expect_type, exp, noside, op,
{ arg1, arg2);
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
return value_zero (value_type (arg1), not_lval);
}
else
{
type = builtin_type (exp->gdbarch)->builtin_double;
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
return ada_value_binop (arg1, arg2, op);
}
case BINOP_EQUAL: case BINOP_EQUAL:
case BINOP_NOTEQUAL: case BINOP_NOTEQUAL: