Implement several Fortran operations
This implements several straightforward Fortran operations, primarily by reusing existing template classes. gdb/ChangeLog 2021-03-08 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.
This commit is contained in:
Tom Tromey
parent
fc715eb288
commit
9dcd3e2957
3 changed files with 131 additions and 14 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2021-03-08 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.
|
||||
|
||||
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* ada-lang.c (ada_ternop_range_operation::evaluate): New method.
|
||||
|
|
|
|||
101
gdb/f-exp.h
Normal file
101
gdb/f-exp.h
Normal file
|
|
@ -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 */
|
||||
36
gdb/f-lang.c
36
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>
|
||||
|
||||
|
|
@ -993,9 +994,10 @@ fortran_associated (struct gdbarch *gdbarch, const language_defn *lang,
|
|||
|
||||
/* 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)
|
||||
|
|
@ -1022,9 +1024,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)
|
||||
|
|
@ -1060,9 +1063,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)
|
||||
|
|
@ -1079,9 +1083,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)
|
||||
|
|
@ -1098,9 +1103,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)
|
||||
|
|
@ -1139,9 +1145,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)
|
||||
|
|
@ -1152,9 +1159,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);
|
||||
|
|
@ -1214,20 +1222,20 @@ 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 UNOP_FORTRAN_ALLOCATED:
|
||||
{
|
||||
|
|
@ -1240,7 +1248,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
|
|||
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 FORTRAN_LBOUND:
|
||||
case FORTRAN_UBOUND:
|
||||
|
|
@ -1305,11 +1313,11 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
|
|||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue