From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6CrAE8GY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:49 -0500 Received: by simark.ca (Postfix, from userid 112) id C4EED1F0BA; Fri, 1 Jan 2021 16:48:47 -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 7F1531F0AA for ; Fri, 1 Jan 2021 16:48:46 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B0C283894C32; Fri, 1 Jan 2021 21:48:25 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 058783894C20 for ; Fri, 1 Jan 2021 21:48:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 058783894C20 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 9CBCB1042370 for ; Fri, 1 Jan 2021 15:48:20 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHUkZEqqoE4DvSHUkuHFz; Fri, 01 Jan 2021 15:48:20 -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=YiLjtL15HUa+++Cfl5YGqQKoxmdS4IMnzq1Qy8SDHGM=; b=VvXZ4ToRovUIqsh1mrSrB/06KI 9hq1of355qCQeawTi95Vu3YOw9nppjWpalFjdxE6SfgfPjq7Jk4kVHZymCDygl30u7ZZ8Yg15ES+m GsYgfy1WsqhhjnVs9wYAw9o++; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60408 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 1kvSHU-0029b0-CN for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:20 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 114/203] Implement UNOP_MEMVAL and UNOP_MEMVAL_TYPE Date: Fri, 1 Jan 2021 14:45:54 -0700 Message-Id: <20210101214723.1784144-115-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: 1kvSHU-0029b0-CN X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60408 X-Source-Auth: tom+tromey.com X-Email-Count: 115 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 unop_memval_operation and unop_memval_type_operation, which implement UNOP_MEMVAL and UNOP_MEMVAL_TYPE. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class unop_memval_operation) (class unop_memval_type_operation): New. * eval.c (eval_op_memval): No longer static. (unop_memval_operation::evaluate_for_address) (unop_memval_type_operation::evaluate_for_address) (unop_memval_operation::evaluate_for_sizeof) (unop_memval_type_operation::evaluate_for_sizeof): New methods. * ax-gdb.c (unop_memval_operation::do_generate_ax) (unop_memval_type_operation::do_generate_ax): New methods. --- gdb/ChangeLog | 12 ++++++++ gdb/ax-gdb.c | 40 ++++++++++++++++++++++++++ gdb/eval.c | 37 ++++++++++++++++++++++++- gdb/expop.h | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 1 deletion(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 756f4d7969a..6514e40cdbf 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2514,6 +2514,46 @@ unop_sizeof_operation::do_generate_ax (struct expression *exp, value->type = builtin_type (ax->gdbarch)->builtin_int; } +void +unop_memval_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + std::get<0> (m_storage)->generate_ax (exp, ax, value); + /* If we have an axs_rvalue or an axs_lvalue_memory, then we + already have the right value on the stack. For + axs_lvalue_register, we must convert. */ + if (value->kind == axs_lvalue_register) + require_rvalue (ax, value); + + value->type = std::get<1> (m_storage); + value->kind = axs_lvalue_memory; +} + +void +unop_memval_type_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + struct value *val + = std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + struct type *type = value_type (val); + + std::get<1> (m_storage)->generate_ax (exp, ax, value); + + /* If we have an axs_rvalue or an axs_lvalue_memory, then we + already have the right value on the stack. For + axs_lvalue_register, we must convert. */ + if (value->kind == axs_lvalue_register) + require_rvalue (ax, value); + + value->type = type; + value->kind = axs_lvalue_memory; +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/eval.c b/gdb/eval.c index 526c80de92b..1ada2f3986b 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1872,7 +1872,7 @@ eval_op_alignof (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_MEMVAL. */ -static struct value * +struct value * eval_op_memval (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct type *type) @@ -3308,6 +3308,25 @@ var_msym_value_operation::evaluate_for_address (struct expression *exp, return value_addr (val); } +value * +unop_memval_operation::evaluate_for_address (struct expression *exp, + enum noside noside) +{ + return value_cast (lookup_pointer_type (std::get<1> (m_storage)), + std::get<0> (m_storage)->evaluate (nullptr, exp, noside)); +} + +value * +unop_memval_type_operation::evaluate_for_address (struct expression *exp, + enum noside noside) +{ + value *typeval = std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + struct type *type = value_type (typeval); + return value_cast (lookup_pointer_type (type), + std::get<1> (m_storage)->evaluate (nullptr, exp, noside)); +} + } /* Evaluate like `evaluate_subexp' except coercing arrays to pointers. @@ -3579,6 +3598,22 @@ unop_ind_base_operation::evaluate_for_sizeof (struct expression *exp, return value_from_longest (size_type, (LONGEST) TYPE_LENGTH (type)); } +value * +unop_memval_operation::evaluate_for_sizeof (struct expression *exp, + enum noside noside) +{ + return evaluate_subexp_for_sizeof_base (exp, std::get<1> (m_storage)); +} + +value * +unop_memval_type_operation::evaluate_for_sizeof (struct expression *exp, + enum noside noside) +{ + value *typeval = std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + return evaluate_subexp_for_sizeof_base (exp, value_type (typeval)); +} + } /* Evaluate a subexpression of EXP, at index *POS, and return a value diff --git a/gdb/expop.h b/gdb/expop.h index b5f01550d85..867cd85ead5 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -192,6 +192,10 @@ extern struct value *eval_op_alignof (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1); +extern struct value *eval_op_memval (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, struct type *type); namespace expr { @@ -1625,6 +1629,79 @@ class unop_alignof_operation { return UNOP_ALIGNOF; } }; +/* Implement UNOP_MEMVAL. */ +class unop_memval_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 *val = std::get<0> (m_storage)->evaluate (expect_type, exp, noside); + return eval_op_memval (expect_type, exp, noside, val, + std::get<1> (m_storage)); + } + + value *evaluate_for_sizeof (struct expression *exp, + enum noside noside) override; + + value *evaluate_for_address (struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return UNOP_MEMVAL; } + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override; +}; + +/* Implement UNOP_MEMVAL_TYPE. */ +class unop_memval_type_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 *typeval + = std::get<0> (m_storage)->evaluate (expect_type, exp, + EVAL_AVOID_SIDE_EFFECTS); + struct type *type = value_type (typeval); + value *val = std::get<1> (m_storage)->evaluate (expect_type, exp, noside); + return eval_op_memval (expect_type, exp, noside, val, type); + } + + value *evaluate_for_sizeof (struct expression *exp, + enum noside noside) override; + + value *evaluate_for_address (struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return UNOP_MEMVAL_TYPE; } + +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