From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sP4BHa2Y71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:29 -0500 Received: by simark.ca (Postfix, from userid 112) id 719151F0B8; 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 70D091F0BC for ; Fri, 1 Jan 2021 16:48:24 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D973388E80F; Fri, 1 Jan 2021 21:48:10 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 6BF963892454 for ; Fri, 1 Jan 2021 21:48:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6BF963892454 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 171E6400C8BC5 for ; Fri, 1 Jan 2021 15:48:05 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHFkyOBqsvw9vSHFkLuCp; 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=Hkse3MPuVlBLrEVl5XTRAfKrKgVsrBTytiSDbVi0k0M=; b=gGJ2wTj8n6igNgl+EIOAszzWmP VuCoWbtXpJyhU11pBDYkNTD/2dQM9cJWRUjoY5uoq3ofjkli7sJQSni55M96PA0EyD3LBZLSVvd5M 9+oUTQcn4f6zbXScTre9ILrKN; 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 1kvSHE-0029SU-Sb for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:04 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 085/203] Introduce internalvar_operation Date: Fri, 1 Jan 2021 14:45:25 -0700 Message-Id: <20210101214723.1784144-86-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: 1kvSHE-0029SU-Sb 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: 86 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 internalvar_operation, which implements OP_INTERNALVAR. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class internalvar_operation): New. * ax-gdb.c (internalvar_operation::do_generate_ax): New method. --- gdb/ChangeLog | 5 +++++ gdb/ax-gdb.c | 25 +++++++++++++++++++++++++ gdb/expop.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 5ffe5a00da1..e25e2942475 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2365,6 +2365,31 @@ register_operation::do_generate_ax (struct expression *exp, value->type = register_type (ax->gdbarch, reg); } +void +internalvar_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + struct internalvar *var = std::get<0> (m_storage); + const char *name = internalvar_name (var); + struct trace_state_variable *tsv; + + tsv = find_trace_state_variable (name); + if (tsv) + { + ax_tsv (ax, aop_getv, tsv->number); + if (ax->tracing) + ax_tsv (ax, aop_tracev, tsv->number); + /* Trace state variables are always 64-bit integers. */ + value->kind = axs_rvalue; + value->type = builtin_type (ax->gdbarch)->builtin_long_long; + } + else if (! compile_internalvar_to_ax (var, ax, value)) + error (_("$%s is not a trace state variable; GDB agent " + "expressions cannot use convenience variables."), name); +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/expop.h b/gdb/expop.h index 2c2f76d1da1..989d54d90ad 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -638,6 +638,38 @@ class bool_operation { return true; } }; +class internalvar_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 + { + return value_of_internalvar (exp->gdbarch, + std::get<0> (m_storage)); + } + + internalvar *get_internalvar () const + { + return std::get<0> (m_storage); + } + + enum exp_opcode opcode () const override + { return OP_INTERNALVAR; } + +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