From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id IM/DELeY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:39 -0500 Received: by simark.ca (Postfix, from userid 112) id 430C81F0B7; Fri, 1 Jan 2021 16:48:39 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,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 D788E1F0BC for ; Fri, 1 Jan 2021 16:48:37 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DEF3C3893675; Fri, 1 Jan 2021 21:48:17 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 1BBCE3893667 for ; Fri, 1 Jan 2021 21:48:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1BBCE3893667 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 B85F8EEF2C1 for ; Fri, 1 Jan 2021 15:48:14 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHOkZEnjoE4DvSHOkuHD6; Fri, 01 Jan 2021 15:48:14 -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=f4YDPByzWT0xhJ57v8uojguJyv8lEny53mC0jWFQVJ4=; b=Yk0fdPTakt9BFkNAKcU5Fch01b 6djmFHmeBjniD3HsPUkVcT7uKo4YCOakYT8gozthha5Vv0ecDDjll4z2oKaiwCyQvuOtyK0xyfgVH ZHx6/xxZ5mZSPtlXV8QuqGBTF; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60400 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 1kvSHO-0029XH-IC for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:14 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 103/203] Introduce comma_operation Date: Fri, 1 Jan 2021 14:45:43 -0700 Message-Id: <20210101214723.1784144-104-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: 1kvSHO-0029XH-IC X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60400 X-Source-Auth: tom+tromey.com X-Email-Count: 104 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 comma_operation, which implements BINOP_COMMA. gdb/ChangeLog 2021-01-01 Tom Tromey * ax-gdb.c (comma_operation::do_generate_ax): New method. --- gdb/ChangeLog | 4 ++++ gdb/ax-gdb.c | 22 ++++++++++++++++++++++ gdb/expop.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 332840456fe..8d5e4fff903 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2469,6 +2469,28 @@ repeat_operation::do_generate_ax (struct expression *exp, value->type = array; } +void +comma_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + /* Note that we need to be a little subtle about generating code + for comma. In C, we can do some optimizations here because + we know the left operand is only being evaluated for effect. + However, if the tracing kludge is in effect, then we always + need to evaluate the left hand side fully, so that all the + variables it mentions get traced. */ + struct axs_value value1; + std::get<0> (m_storage)->generate_ax (exp, ax, &value1); + /* Don't just dispose of the left operand. We might be tracing, + in which case we want to emit code to trace it if it's an + lvalue. */ + gen_traced_pop (ax, &value1); + std::get<1> (m_storage)->generate_ax (exp, ax, value); + /* It's the consumer's responsibility to trace the right operand. */ +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/expop.h b/gdb/expop.h index 419ce05abaf..67b265ca8f0 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -1197,6 +1197,37 @@ class repeat_operation override; }; +/* C-style comma operator. */ +class comma_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 + { + /* The left-hand-side is only evaluated for side effects, so don't + bother in other modes. */ + if (noside == EVAL_NORMAL) + std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + return std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + } + + enum exp_opcode opcode () const override + { return BINOP_COMMA; } + +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