From 3dc41f3cdf92c5ed486f313ababb8b42f0573a15 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out eval_op_f_ceil This splits UNOP_FORTRAN_CEILING into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * f-lang.c (eval_op_f_ceil): New function. (evaluate_subexp_f): Use it. --- gdb/ChangeLog | 5 +++++ gdb/f-lang.c | 34 +++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ef687f613e..4b00777edb8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * f-lang.c (eval_op_f_ceil): New function. + (evaluate_subexp_f): Use it. + 2021-03-08 Tom Tromey * f-lang.c (eval_op_f_mod): New function. diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 57e393614fe..f3fce2240d5 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -1041,6 +1041,25 @@ eval_op_f_mod (struct type *expect_type, struct expression *exp, error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type)); } +/* A helper function for UNOP_FORTRAN_CEILING. */ + +static struct value * +eval_op_f_ceil (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + struct type *type = value_type (arg1); + if (type->code () != TYPE_CODE_FLT) + error (_("argument to CEILING must be of type float")); + double val + = target_float_to_host_double (value_contents (arg1), + value_type (arg1)); + val = ceil (val); + return value_from_host_double (type, val); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -1072,19 +1091,8 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, return eval_op_f_mod (expect_type, exp, noside, arg1, arg2); case UNOP_FORTRAN_CEILING: - { - arg1 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - type = value_type (arg1); - if (type->code () != TYPE_CODE_FLT) - error (_("argument to CEILING must be of type float")); - double val - = target_float_to_host_double (value_contents (arg1), - value_type (arg1)); - val = ceil (val); - return value_from_host_double (type, val); - } + arg1 = evaluate_subexp (nullptr, exp, pos, noside); + return eval_op_f_ceil (expect_type, exp, noside, arg1); case UNOP_FORTRAN_FLOOR: { -- 2.30.2