mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-07-27 03:42:56 +08:00
Split out eval_ternop_in_range
This splits TERNOP_IN_RANGE into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey <tom@tromey.com> * ada-lang.c (eval_ternop_in_range): New function. (ada_evaluate_subexp): Use it.
This commit is contained in:
@ -1,3 +1,8 @@
|
|||||||
|
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
|
* ada-lang.c (eval_ternop_in_range): New function.
|
||||||
|
(ada_evaluate_subexp): Use it.
|
||||||
|
|
||||||
2021-03-08 Tom Tromey <tom@tromey.com>
|
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
* opencl-lang.c (eval_opencl_assign): New function.
|
* opencl-lang.c (eval_opencl_assign): New function.
|
||||||
|
@ -9939,6 +9939,27 @@ ada_evaluate_subexp_for_cast (expression *exp, int *pos,
|
|||||||
return ada_value_cast (to_type, val);
|
return ada_value_cast (to_type, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A helper function for TERNOP_IN_RANGE. */
|
||||||
|
|
||||||
|
static value *
|
||||||
|
eval_ternop_in_range (struct type *expect_type, struct expression *exp,
|
||||||
|
enum noside noside,
|
||||||
|
value *arg1, value *arg2, value *arg3)
|
||||||
|
{
|
||||||
|
if (noside == EVAL_SKIP)
|
||||||
|
return eval_skip_value (exp);
|
||||||
|
|
||||||
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
||||||
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3);
|
||||||
|
struct type *type = language_bool_type (exp->language_defn, exp->gdbarch);
|
||||||
|
return
|
||||||
|
value_from_longest (type,
|
||||||
|
(value_less (arg1, arg3)
|
||||||
|
|| value_equal (arg1, arg3))
|
||||||
|
&& (value_less (arg2, arg1)
|
||||||
|
|| value_equal (arg2, arg1)));
|
||||||
|
}
|
||||||
|
|
||||||
/* 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. */
|
||||||
|
|
||||||
@ -10551,18 +10572,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
|||||||
arg2 = evaluate_subexp (nullptr, exp, pos, noside);
|
arg2 = evaluate_subexp (nullptr, exp, pos, noside);
|
||||||
arg3 = evaluate_subexp (nullptr, exp, pos, noside);
|
arg3 = evaluate_subexp (nullptr, exp, pos, noside);
|
||||||
|
|
||||||
if (noside == EVAL_SKIP)
|
return eval_ternop_in_range (expect_type, exp, noside, arg1, arg2, arg3);
|
||||||
goto nosideret;
|
|
||||||
|
|
||||||
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
||||||
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3);
|
|
||||||
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
||||||
return
|
|
||||||
value_from_longest (type,
|
|
||||||
(value_less (arg1, arg3)
|
|
||||||
|| value_equal (arg1, arg3))
|
|
||||||
&& (value_less (arg2, arg1)
|
|
||||||
|| value_equal (arg2, arg1)));
|
|
||||||
|
|
||||||
case OP_ATR_FIRST:
|
case OP_ATR_FIRST:
|
||||||
case OP_ATR_LAST:
|
case OP_ATR_LAST:
|
||||||
|
Reference in New Issue
Block a user