From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uE+UHb2Y71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:45 -0500 Received: by simark.ca (Postfix, from userid 112) id 70DFD1F0AA; Fri, 1 Jan 2021 16:48:41 -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 C0F0F1F0B7 for ; Fri, 1 Jan 2021 16:48:39 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 99FB13894C1B; Fri, 1 Jan 2021 21:48:20 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id B148A3893675 for ; Fri, 1 Jan 2021 21:48:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B148A3893675 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 571EFEEF2C0 for ; Fri, 1 Jan 2021 15:48:15 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHPkZEo8oE4DvSHPkuHDX; Fri, 01 Jan 2021 15:48:15 -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=BUELbpLdB1ZuE8HP0Rl5UsSzbHQ2doSdcm0pfoVGkTY=; b=iYtBYeEUhwWjWXTmTG1B0SQXsf VhCW8GTql7gGayEWoZVAQ5XiFwqbcvTf4gPwRRC6T7nfOwlZY5fxfG7jUjfILybaGet7ubrYBpC3w 2nY5fmH+eCGyaEHWZOiOj0nwk; 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 1kvSHP-0029XH-45 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:15 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 106/203] Introduce unop_ind_operation Date: Fri, 1 Jan 2021 14:45:46 -0700 Message-Id: <20210101214723.1784144-107-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: 1kvSHP-0029XH-45 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: 107 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_ind_operation, which implements UNOP_IND. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class unop_ind_base_operation) (class unop_ind_operation): New. * eval.c (eval_op_ind): No longer static. Remove "op" parameter. (unop_ind_base_operation::evaluate_for_address) (unop_ind_base_operation::evaluate_for_sizeof): New method. * ax-gdb.c (gen_expr_unop) : New. --- gdb/ChangeLog | 9 +++++++++ gdb/ax-gdb.c | 8 ++++++++ gdb/eval.c | 45 +++++++++++++++++++++++++++++++++++++----- gdb/expop.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 5 deletions(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index c87b290397d..f7ab50f8cde 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2736,6 +2736,14 @@ gen_expr_unop (struct expression *exp, gen_complement (ax, value); break; + case UNOP_IND: + lhs->generate_ax (exp, ax, value); + gen_usual_unary (ax, value); + if (!pointer_type (value->type)) + error (_("Argument of unary `*' is not a pointer.")); + gen_deref (value); + break; + default: gdb_assert_not_reached ("invalid case in gen_expr_unop"); } diff --git a/gdb/eval.c b/gdb/eval.c index b7f816e28fe..cca88d49230 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1812,9 +1812,9 @@ eval_op_lognot (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_IND. */ -static struct value * +struct value * eval_op_ind (struct type *expect_type, struct expression *exp, - enum noside noside, enum exp_opcode op, + enum noside noside, struct value *arg1) { struct type *type = check_typedef (value_type (arg1)); @@ -1824,8 +1824,8 @@ eval_op_ind (struct type *expect_type, struct expression *exp, "to member without an object")); if (noside == EVAL_SKIP) return eval_skip_value (exp); - if (unop_user_defined_p (op, arg1)) - return value_x_unop (arg1, op, noside); + if (unop_user_defined_p (UNOP_IND, arg1)) + return value_x_unop (arg1, UNOP_IND, noside); else if (noside == EVAL_AVOID_SIDE_EFFECTS) { type = check_typedef (value_type (arg1)); @@ -2949,7 +2949,7 @@ evaluate_subexp_standard (struct type *expect_type, if (expect_type && expect_type->code () == TYPE_CODE_PTR) expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type)); arg1 = evaluate_subexp (expect_type, exp, pos, noside); - return eval_op_ind (expect_type, exp, noside, op, arg1); + return eval_op_ind (expect_type, exp, noside, arg1); case UNOP_ADDR: /* C++: check for and handle pointer to members. */ @@ -3276,6 +3276,22 @@ scope_operation::evaluate_for_address (struct expression *exp, return x; } +value * +unop_ind_base_operation::evaluate_for_address (struct expression *exp, + enum noside noside) +{ + value *x = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + + /* We can't optimize out "&*" if there's a user-defined operator*. */ + if (unop_user_defined_p (UNOP_IND, x)) + { + x = value_x_unop (x, UNOP_IND, noside); + return evaluate_subexp_for_address_base (exp, noside, x); + } + + return coerce_array (x); +} + value * var_msym_value_operation::evaluate_for_address (struct expression *exp, enum noside noside) @@ -3544,6 +3560,25 @@ subscript_operation::evaluate_for_sizeof (struct expression *exp, return operation::evaluate_for_sizeof (exp, noside); } +value * +unop_ind_base_operation::evaluate_for_sizeof (struct expression *exp, + enum noside noside) +{ + value *val = std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + struct type *type = check_typedef (value_type (val)); + if (type->code () != TYPE_CODE_PTR + && !TYPE_IS_REFERENCE (type) + && type->code () != TYPE_CODE_ARRAY) + error (_("Attempt to take contents of a non-pointer value.")); + type = TYPE_TARGET_TYPE (type); + if (is_dynamic_type (type)) + type = value_type (value_ind (val)); + /* FIXME: This should be size_t. */ + struct type *size_type = builtin_type (exp->gdbarch)->builtin_int; + return value_from_longest (size_type, (LONGEST) TYPE_LENGTH (type)); +} + } /* Evaluate a subexpression of EXP, at index *POS, and return a value diff --git a/gdb/expop.h b/gdb/expop.h index 913988d7692..caac155295a 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -181,6 +181,10 @@ extern struct value *eval_op_postdec (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1); +extern struct value *eval_op_ind (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1); namespace expr { @@ -1355,6 +1359,56 @@ using postinc_operation using postdec_operation = unop_incr_operation; +/* Base class for implementations of UNOP_IND. */ +class unop_ind_base_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 + { + if (expect_type != nullptr && expect_type->code () == TYPE_CODE_PTR) + expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type)); + value *val = std::get<0> (m_storage)->evaluate (expect_type, exp, noside); + return eval_op_ind (expect_type, exp, noside, val); + } + + value *evaluate_for_address (struct expression *exp, + enum noside noside) override; + + value *evaluate_for_sizeof (struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return UNOP_IND; } +}; + +/* Ordinary UNOP_IND implementation. */ +class unop_ind_operation + : public unop_ind_base_operation +{ +public: + + using unop_ind_base_operation::unop_ind_base_operation; + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override + { + gen_expr_unop (exp, UNOP_IND, + std::get<0> (this->m_storage).get (), + ax, value); + } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2