From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8JjTFq2Y718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:29 -0500 Received: by simark.ca (Postfix, from userid 112) id E1F881F0C4; Fri, 1 Jan 2021 16:48:26 -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, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 3A0751F0BA for ; Fri, 1 Jan 2021 16:48:25 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2B75B38930FA; Fri, 1 Jan 2021 21:48:11 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id F3C813844047 for ; Fri, 1 Jan 2021 21:48:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F3C813844047 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 cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 916A2400C8BAB for ; Fri, 1 Jan 2021 15:48:05 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHFkyOC8svw9vSHFkLuD8; Fri, 01 Jan 2021 15:48:05 -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=wGtd9CYBV7CmfdjD+fmCzvyQbkBIZKYQp9peUiQqTVY=; b=E1f9z5H65iLwKMGwa67onsuTN4 c86EtL30BFfQoPKjV9U13fKxa3QzXzE5bWA83mzxQhbNnLhm3sA/3r0vfQEY/vgfwQgmnOHjhlFHb nfcVbWiP0LiZKBHmOy60xFzHG; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60392 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 1kvSHF-0029SU-D8 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:05 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 088/203] Introduce ternop_cond_operation Date: Fri, 1 Jan 2021 14:45:28 -0700 Message-Id: <20210101214723.1784144-89-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: 1kvSHF-0029SU-D8 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60392 X-Source-Auth: tom+tromey.com X-Email-Count: 89 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 adds class ternop_cond_operation, which implements TERNOP_COND. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class ternop_cond_operation): New. * ax-gdb.c (ternop_cond_operation::do_generate_ax): New method. --- gdb/ChangeLog | 5 +++++ gdb/ax-gdb.c | 29 +++++++++++++++++++++++++++++ gdb/expop.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index e25e2942475..87aa2107872 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2390,6 +2390,35 @@ internalvar_operation::do_generate_ax (struct expression *exp, "expressions cannot use convenience variables."), name); } +void +ternop_cond_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + struct axs_value value1, value2, value3; + int if1, end; + + std::get<0> (m_storage)->generate_ax (exp, ax, &value1); + gen_usual_unary (ax, &value1); + /* For (A ? B : C), it's easiest to generate subexpression + bytecodes in order, but if_goto jumps on true, so we invert + the sense of A. Then we can do B by dropping through, and + jump to do C. */ + gen_logical_not (ax, &value1, builtin_type (ax->gdbarch)->builtin_int); + if1 = ax_goto (ax, aop_if_goto); + std::get<1> (m_storage)->generate_ax (exp, ax, &value2); + gen_usual_unary (ax, &value2); + end = ax_goto (ax, aop_goto); + ax_label (ax, if1, ax->len); + std::get<2> (m_storage)->generate_ax (exp, ax, &value3); + gen_usual_unary (ax, &value3); + ax_label (ax, end, ax->len); + /* This is arbitrary - what if B and C are incompatible types? */ + value->type = value2.type; + value->kind = value2.kind; +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/expop.h b/gdb/expop.h index 49a03ce70c6..0bb9e081df0 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -723,6 +723,37 @@ class ternop_slice_operation { return TERNOP_SLICE; } }; +class ternop_cond_operation + : public maybe_constant_operation +{ +public: + + using maybe_constant_operation::maybe_constant_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + struct value *val + = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + + if (value_logical_not (val)) + return std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + return std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + } + + enum exp_opcode opcode () const override + { return TERNOP_COND; } + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override; +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2