From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wHZeAdCY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:04 -0500 Received: by simark.ca (Postfix, from userid 112) id 018951F0C4; Fri, 1 Jan 2021 16:49:03 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id CF4641F0BC for ; Fri, 1 Jan 2021 16:48:58 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 083213896836; Fri, 1 Jan 2021 21:48:33 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 971DA389682C for ; Fri, 1 Jan 2021 21:48:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 971DA389682C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 3D7E2107C2E1 for ; Fri, 1 Jan 2021 15:48:29 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHdkZEvfoE4DvSHdkuHKh; Fri, 01 Jan 2021 15:48:29 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hBhlxYm5NLSyTkGjEVjWlRqfVpOloEEkCNUry+q3GOg=; b=KjHI/uL9OUduoktd9isnU1wd/O alV4/Yx4qOnbWz/ybpJFDGUqsY/KsYcfidQqIhQYxBcUYMcuGhr/8LZ5HS50a61hOS2EWQrsoGlLf fQ2BBS0uHGX5dNr5PRrYsQQPX; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60412 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kvSHc-0029i1-Vi for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:29 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 129/203] Implement several Fortran operations Date: Fri, 1 Jan 2021 14:46:09 -0700 Message-Id: <20210101214723.1784144-130-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.81.39 X-Source-L: No X-Exim-ID: 1kvSHc-0029i1-Vi X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60412 X-Source-Auth: tom+tromey.com X-Email-Count: 130 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This implements several straightforward Fortran operations, primarily by reusing existing template classes. gdb/ChangeLog 2021-01-01 Tom Tromey * 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 . */ + +#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; +using fortran_ceil_operation = unop_operation; +using fortran_floor_operation = unop_operation; +using fortran_kind_operation = unop_operation; + +using fortran_mod_operation = binop_operation; +using fortran_modulo_operation = binop_operation; + +/* The Fortran "complex" operation. */ +class fortran_cmplx_operation + : public tuple_holding_operation +{ +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 @@ -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