diff options
| author | Tom Tromey <tom@tromey.com> | 2021-03-08 07:27:57 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2021-03-08 07:28:06 -0700 |
| commit | 216f6fcbefa770589def331a4bcd1d244fbaf858 (patch) | |
| tree | 76c28baec75743bb1f623380dcdfd009f0d255fe /gdb | |
| parent | 00f2db6f7d52b718d5436e76184c92006713f531 (diff) | |
| download | gdb-216f6fcbefa770589def331a4bcd1d244fbaf858.zip gdb-216f6fcbefa770589def331a4bcd1d244fbaf858.tar.gz gdb-216f6fcbefa770589def331a4bcd1d244fbaf858.tar.bz2 | |
Split out eval_op_f_kind
This splits UNOP_FORTRAN_KIND into a new function for future use.
gdb/ChangeLog
2021-03-08 Tom Tromey <tom@tromey.com>
* f-lang.c (eval_op_f_kind): New function.
(evaluate_subexp_f): Use it.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/f-lang.c | 43 |
2 files changed, 31 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b23e7c..0958f59 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-03-08 Tom Tromey <tom@tromey.com> + * f-lang.c (eval_op_f_kind): New function. + (evaluate_subexp_f): Use it. + +2021-03-08 Tom Tromey <tom@tromey.com> + * f-lang.c (eval_op_f_cmplx): New function. (evaluate_subexp_f): Use it. diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 554626e..659b0c8 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -1133,6 +1133,31 @@ eval_op_f_cmplx (struct type *expect_type, struct expression *exp, return value_literal_complex (arg1, arg2, type); } +/* A helper function for UNOP_FORTRAN_KIND. */ + +static struct value * +eval_op_f_kind (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1) +{ + struct type *type = value_type (arg1); + + switch (type->code ()) + { + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + case TYPE_CODE_MODULE: + case TYPE_CODE_FUNC: + error (_("argument to kind must be an intrinsic type")); + } + + if (!TYPE_TARGET_TYPE (type)) + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, + TYPE_LENGTH (type)); + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, + TYPE_LENGTH (TYPE_TARGET_TYPE (type))); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -1264,23 +1289,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, case UNOP_FORTRAN_KIND: arg1 = evaluate_subexp (NULL, exp, pos, EVAL_AVOID_SIDE_EFFECTS); - type = value_type (arg1); - - switch (type->code ()) - { - case TYPE_CODE_STRUCT: - case TYPE_CODE_UNION: - case TYPE_CODE_MODULE: - case TYPE_CODE_FUNC: - error (_("argument to kind must be an intrinsic type")); - } - - if (!TYPE_TARGET_TYPE (type)) - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, - TYPE_LENGTH (type)); - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, - TYPE_LENGTH (TYPE_TARGET_TYPE (type))); - + return eval_op_f_kind (expect_type, exp, noside, arg1); case OP_F77_UNDETERMINED_ARGLIST: /* Remember that in F77, functions, substring ops and array subscript |