[PATCH 129/203] Implement several Fortran operations

Tom Tromey
2021-01-01T21:49:04Z

This implements several straightforward Fortran operations, primarily
by reusing existing template classes.

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

* f-lang.c (eval_op_f_abs, eval_op_f_mod, eval_op_f_ceil)
(eval_op_f_floor, eval_op_f_modulo, eval_op_f_cmplx)
(eval_op_f_kind): No longer static. Add "opcode" parameter.
(evaluate_subexp_f): Update.
* f-exp.h: New file.
---
gdb/ChangeLog | 8 ++++
gdb/f-exp.h | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/f-lang.c | 36 +++++++++++-------
3 files changed, 131 insertions(+), 14 deletions(-)
create mode 100644 gdb/f-exp.h

diff --git a/gdb/f-exp.h b/gdb/f-exp.h
new file mode 100644
index 00000000000..4b3fdd4a53e
--- /dev/null
+++ b/gdb/f-exp.h
@@ -0,0 +1,101 @@
+/* Definitions for Fortran expressions
+
+ Copyright (C) 2020 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef FORTRAN_EXP_H
+#define FORTRAN_EXP_H
+
+#include "expop.h"
+
+extern struct value *eval_op_f_abs (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1);
+extern struct value *eval_op_f_mod (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1, struct value *arg2);
+extern struct value *eval_op_f_ceil (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1);
+extern struct value *eval_op_f_floor (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1);
+extern struct value *eval_op_f_modulo (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1, struct value *arg2);
+extern struct value *eval_op_f_cmplx (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1, struct value *arg2);
+extern struct value *eval_op_f_kind (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ enum exp_opcode opcode,
+ struct value *arg1);
+
+namespace expr
+{
+
+using fortran_abs_operation = unop_operation<UNOP_ABS, eval_op_f_abs>;
+using fortran_ceil_operation = unop_operation<UNOP_FORTRAN_CEILING,
+ eval_op_f_ceil>;
+using fortran_floor_operation = unop_operation<UNOP_FORTRAN_FLOOR,
+ eval_op_f_floor>;
+using fortran_kind_operation = unop_operation<UNOP_FORTRAN_KIND,
+ eval_op_f_kind>;
+
+using fortran_mod_operation = binop_operation<BINOP_MOD, eval_op_f_mod>;
+using fortran_modulo_operation = binop_operation<BINOP_FORTRAN_MODULO,
+ eval_op_f_modulo>;
+
+/* The Fortran "complex" operation. */
+class fortran_cmplx_operation
+ : public tuple_holding_operation<operation_up, operation_up>
+{
+public:
+
+ using tuple_holding_operation::tuple_holding_operation;
+
+ value *evaluate (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside) override
+ {
+ value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+ value *arg2 = std::get<1> (m_storage)->evaluate (value_type (arg1),
+ exp, noside);
+ return eval_op_f_cmplx (expect_type, exp, noside, BINOP_FORTRAN_CMPLX,
+ arg1, arg2);
+ }
+
+ enum exp_opcode opcode () const override
+ { return BINOP_FORTRAN_CMPLX; }
+};
+
+} /* namespace expr */
+
+#endif /* FORTRAN_EXP_H */
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index d0932389726..c680e136976 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -38,6 +38,7 @@
#include "gdbarch.h"
#include "gdbcmd.h"
#include "f-array-walker.h"
+#include "f-exp.h"

#include <math.h>

@@ -704,9 +705,10 @@ fortran_value_subarray (struct value *array, struct expression *exp,

/* A helper function for UNOP_ABS. */

-static struct value *
+struct value *
eval_op_f_abs (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1)
{
if (noside == EVAL_SKIP)
@@ -733,9 +735,10 @@ eval_op_f_abs (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_MOD. */

-static struct value *
+struct value *
eval_op_f_mod (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1, struct value *arg2)
{
if (noside == EVAL_SKIP)
@@ -771,9 +774,10 @@ eval_op_f_mod (struct type *expect_type, struct expression *exp,

/* A helper function for UNOP_FORTRAN_CEILING. */

-static struct value *
+struct value *
eval_op_f_ceil (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1)
{
if (noside == EVAL_SKIP)
@@ -790,9 +794,10 @@ eval_op_f_ceil (struct type *expect_type, struct expression *exp,

/* A helper function for UNOP_FORTRAN_FLOOR. */

-static struct value *
+struct value *
eval_op_f_floor (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1)
{
if (noside == EVAL_SKIP)
@@ -809,9 +814,10 @@ eval_op_f_floor (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_FORTRAN_MODULO. */

-static struct value *
+struct value *
eval_op_f_modulo (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1, struct value *arg2)
{
if (noside == EVAL_SKIP)
@@ -850,9 +856,10 @@ eval_op_f_modulo (struct type *expect_type, struct expression *exp,

/* A helper function for BINOP_FORTRAN_CMPLX. */

-static struct value *
+struct value *
eval_op_f_cmplx (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1, struct value *arg2)
{
if (noside == EVAL_SKIP)
@@ -863,9 +870,10 @@ eval_op_f_cmplx (struct type *expect_type, struct expression *exp,

/* A helper function for UNOP_FORTRAN_KIND. */

-static struct value *
+struct value *
eval_op_f_kind (struct type *expect_type, struct expression *exp,
enum noside noside,
+ enum exp_opcode opcode,
struct value *arg1)
{
struct type *type = value_type (arg1);
@@ -909,34 +917,34 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,

case UNOP_ABS:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- return eval_op_f_abs (expect_type, exp, noside, arg1);
+ return eval_op_f_abs (expect_type, exp, noside, op, arg1);

case BINOP_MOD:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
- return eval_op_f_mod (expect_type, exp, noside, arg1, arg2);
+ return eval_op_f_mod (expect_type, exp, noside, op, arg1, arg2);

case UNOP_FORTRAN_CEILING:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- return eval_op_f_ceil (expect_type, exp, noside, arg1);
+ return eval_op_f_ceil (expect_type, exp, noside, op, arg1);

case UNOP_FORTRAN_FLOOR:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- return eval_op_f_floor (expect_type, exp, noside, arg1);
+ return eval_op_f_floor (expect_type, exp, noside, op, arg1);

case BINOP_FORTRAN_MODULO:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
- return eval_op_f_modulo (expect_type, exp, noside, arg1, arg2);
+ return eval_op_f_modulo (expect_type, exp, noside, op, arg1, arg2);

case BINOP_FORTRAN_CMPLX:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
- return eval_op_f_cmplx (expect_type, exp, noside, arg1, arg2);
+ return eval_op_f_cmplx (expect_type, exp, noside, op, arg1, arg2);

case UNOP_FORTRAN_KIND:
arg1 = evaluate_subexp (NULL, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
- return eval_op_f_kind (expect_type, exp, noside, arg1);
+ return eval_op_f_kind (expect_type, exp, noside, op, arg1);

case OP_F77_UNDETERMINED_ARGLIST:
/* Remember that in F77, functions, substring ops and array subscript
--
2.26.2