mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Split out eval_op_ternop

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

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

	* eval.c (eval_op_ternop): New function.
	(evaluate_subexp_standard): Use it.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent 5c2f201e8d
commit f960a6176a
2 changed files with 22 additions and 7 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_ternop): New function.
(evaluate_subexp_standard): Use it.
2021-03-08 Tom Tromey <tom@tromey.com>
* eval.c (eval_op_concat): New function.

24
gdb/eval.c
View File

@ -1324,6 +1324,20 @@ eval_op_concat (struct type *expect_type, struct expression *exp,
return value_concat (arg1, arg2);
}
/* A helper function for TERNOP_SLICE. */
static struct value *
eval_op_ternop (struct type *expect_type, struct expression *exp,
enum noside noside,
struct value *array, struct value *low, struct value *upper)
{
if (noside == EVAL_SKIP)
return eval_skip_value (exp);
int lowbound = value_as_long (low);
int upperbound = value_as_long (upper);
return value_slice (array, lowbound, upperbound - lowbound + 1);
}
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@ -1579,13 +1593,9 @@ evaluate_subexp_standard (struct type *expect_type,
case TERNOP_SLICE:
{
struct value *array = evaluate_subexp (nullptr, exp, pos, noside);
int lowbound
= value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
int upper = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
if (noside == EVAL_SKIP)
return eval_skip_value (exp);
return value_slice (array, lowbound, upper - lowbound + 1);
struct value *low = evaluate_subexp (nullptr, exp, pos, noside);
struct value *upper = evaluate_subexp (nullptr, exp, pos, noside);
return eval_op_ternop (expect_type, exp, noside, array, low, upper);
}
case TERNOP_COND: