From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.202]) by sourceware.org (Postfix) with ESMTPS id BCB0D3953C05 for ; Sat, 20 Feb 2021 20:16:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BCB0D3953C05 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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 43CC2D970 for ; Sat, 20 Feb 2021 14:16:40 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgClzWF7iQiZDYgClHH1b; Sat, 20 Feb 2021 14:16:40 -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=77CEHqmhFSVNFAXlYqTTFJW/eTSZfW2/2Zqb3suhSp0=; b=aKJcoXqfHBfEHHmGSk91WnmCoy TgPWFPrB3++jcCkdfwKnVOxDQdc2xKMoooKft29MvqkBbxR+C1Ql+5W1AFwn/dkk9L6N8Lb+Vf0Ax qnX+JcBfWesWW6g3EpJw2w1KP; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52696 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 1lDYgC-000GeR-1w for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:40 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 126/206] Introduce ada_wrapped_operation Date: Sat, 20 Feb 2021 13:14:49 -0700 Message-Id: <20210220201609.838264-127-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYgC-000GeR-1w X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52696 X-Source-Auth: tom+tromey.com X-Email-Count: 127 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Sat, 20 Feb 2021 20:16:51 -0000 This adds class ada_wrapped_operation, which is used to wrap some generic operations with a bit of Ada-specific handling. This corresponds to the old "default" case in ada_evaluate_subexp. gdb/ChangeLog 2021-02-20 Tom Tromey * ada-lang.c (ada_wrapped_operation::evaluate): New method. * ada-exp.h: New file. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ gdb/ada-lang.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 gdb/ada-exp.h diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h new file mode 100644 index 00000000000..3f780dc9ff4 --- /dev/null +++ b/gdb/ada-exp.h @@ -0,0 +1,47 @@ +/* Definitions for Ada 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 ADA_EXP_H +#define ADA_EXP_H + +#include "expop.h" + +namespace expr +{ + +/* In Ada, some generic operations must be wrapped with a handler that + handles some Ada-specific type conversions. */ +class ada_wrapped_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; + + enum exp_opcode opcode () const override + { return std::get<0> (m_storage)->opcode (); } +}; + +} /* namespace expr */ + +#endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index ae1adca1d5e..80b1fa1a4d6 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -57,6 +57,7 @@ #include "gdbsupport/function-view.h" #include "gdbsupport/byte-vector.h" #include +#include "ada-exp.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). @@ -10562,6 +10563,34 @@ ada_binop_exp (struct type *expect_type, } } +namespace expr +{ + +value * +ada_wrapped_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *result = std::get<0> (m_storage)->evaluate (expect_type, exp, noside); + if (noside == EVAL_NORMAL) + result = unwrap_value (result); + + /* If evaluating an OP_FLOAT and an EXPECT_TYPE was provided, + then we need to perform the conversion manually, because + evaluate_subexp_standard doesn't do it. This conversion is + necessary in Ada because the different kinds of float/fixed + types in Ada have different representations. + + Similarly, we need to perform the conversion from OP_LONG + ourselves. */ + if ((opcode () == OP_FLOAT || opcode () == OP_LONG) && expect_type != NULL) + result = ada_value_cast (expect_type, result); + + return result; +} + +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ -- 2.26.2