From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kLNSBbeY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:39 -0500 Received: by simark.ca (Postfix, from userid 112) id 131F21F0AA; 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=-0.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 3841C1F0B8 for ; Fri, 1 Jan 2021 16:48:33 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE0DE381DCCB; Fri, 1 Jan 2021 21:48:16 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 5C18938930FF for ; Fri, 1 Jan 2021 21:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C18938930FF 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 cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway31.websitewelcome.com (Postfix) with ESMTP id F04D52FFF7 for ; Fri, 1 Jan 2021 15:48:13 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHNkJAVmuDoAvSHNkccRH; Fri, 01 Jan 2021 15:48:13 -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=nLjYqDbLHjvEQsHW7HY9IWz9N+6rTOsd+256IPHp6dI=; b=CnD9F9GRCxsLtLJXmN7w4RXLWy tv6XVYjs34lOToTFuqkgc6oAaxfpUGgfxduTho8TkIgeFW4HQyvv/fYc3bwR0+F25v+Xt/eFKBVTX TLpIcjkqOsSqmaBiQiNGvfu2r; 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 1kvSHN-0029XH-Mf for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:13 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 100/203] Introduce subscript_operation Date: Fri, 1 Jan 2021 14:45:40 -0700 Message-Id: <20210101214723.1784144-101-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: 1kvSHN-0029XH-Mf 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: 101 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 subscript_operation, which implements BINOP_SUBSCRIPT. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class subscript_operation): New. * eval.c (eval_op_subscript): No longer static. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 35 ++++++++++++++++++++++++++++++++++- gdb/expop.h | 16 ++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/gdb/eval.c b/gdb/eval.c index 282abc910ce..e67842dea57 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1543,7 +1543,7 @@ eval_op_binary (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_SUBSCRIPT. */ -static struct value * +struct value * eval_op_subscript (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -3511,6 +3511,39 @@ var_msym_value_operation::evaluate_for_sizeof (struct expression *exp, return value_from_longest (size_type, TYPE_LENGTH (type)); } +value * +subscript_operation::evaluate_for_sizeof (struct expression *exp, + enum noside noside) +{ + if (noside == EVAL_NORMAL) + { + 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_ARRAY) + { + type = check_typedef (TYPE_TARGET_TYPE (type)); + if (type->code () == TYPE_CODE_ARRAY) + { + type = type->index_type (); + /* Only re-evaluate the right hand side if the resulting type + is a variable length type. */ + if (type->bounds ()->flag_bound_evaluated) + { + val = evaluate (nullptr, exp, EVAL_NORMAL); + /* 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 (value_type (val))); + } + } + } + } + + return operation::evaluate_for_sizeof (exp, noside); +} + } /* Evaluate a subexpression of EXP, at index *POS, and return a value diff --git a/gdb/expop.h b/gdb/expop.h index f4a33f491e3..556ceaa1e87 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -99,6 +99,11 @@ extern struct value *eval_op_binary (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2); +extern struct value *eval_op_subscript (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); namespace expr { @@ -1101,6 +1106,17 @@ using bitwise_ior_operation using bitwise_xor_operation = usual_ax_binop_operation; +class subscript_operation + : public usual_ax_binop_operation +{ +public: + using usual_ax_binop_operation::usual_ax_binop_operation; + + value *evaluate_for_sizeof (struct expression *exp, + enum noside noside) override; +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2