From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id 0038D388E82B for ; Fri, 1 Jan 2021 21:47:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0038D388E82B 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 974406076 for ; Fri, 1 Jan 2021 15:47:48 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGykXAe7HPnUvSGykgzNS; Fri, 01 Jan 2021 15:47:48 -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=dCqO6ijQmMwZSKGNxohXYyv4yHXSwZL8lNRresy92jE=; b=SR6ctaUHSQhVtCFQLp5YQTDdzs 9V53ECQwX+7yGFXjyAUNzxgvDI3Q6sR//sTV3iS4foW3RcuZ3iTdtVZqT6Q/B0gOx4eVKCz7JK7vj RaYRVKaqNeEUoPBqAJccRPlwy; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60384 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 1kvSGy-0029E8-E7 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:48 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 048/203] Split out eval_op_rust_array Date: Fri, 1 Jan 2021 14:44:48 -0700 Message-Id: <20210101214723.1784144-49-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: 1kvSGy-0029E8-E7 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60384 X-Source-Auth: tom+tromey.com X-Email-Count: 49 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Fri, 01 Jan 2021 21:47:50 -0000 This splits OP_ARRAY into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (eval_op_rust_array): New function. (rust_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/rust-lang.c | 49 +++++++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 5e293663828..ba57b6d0572 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1354,6 +1354,34 @@ eval_op_rust_complement (struct type *expect_type, struct expression *exp, return value_complement (value); } +/* A helper function for OP_ARRAY. */ + +static struct value * +eval_op_rust_array (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *elt, struct value *ncopies) +{ + int copies = value_as_long (ncopies); + if (copies < 0) + error (_("Array with negative number of elements")); + + if (noside == EVAL_NORMAL) + { + int i; + std::vector eltvec (copies); + + for (i = 0; i < copies; ++i) + eltvec[i] = elt; + return value_array (0, copies - 1, eltvec.data ()); + } + else + { + struct type *arraytype + = lookup_array_range_type (value_type (elt), 0, copies - 1); + return allocate_value (arraytype); + } +} + /* evaluate_exp implementation for Rust. */ static struct value * @@ -1472,31 +1500,12 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, case OP_RUST_ARRAY: { (*pos)++; - int copies; struct value *elt; struct value *ncopies; elt = rust_evaluate_subexp (NULL, exp, pos, noside); ncopies = rust_evaluate_subexp (NULL, exp, pos, noside); - copies = value_as_long (ncopies); - if (copies < 0) - error (_("Array with negative number of elements")); - - if (noside == EVAL_NORMAL) - { - int i; - std::vector eltvec (copies); - - for (i = 0; i < copies; ++i) - eltvec[i] = elt; - result = value_array (0, copies - 1, eltvec.data ()); - } - else - { - struct type *arraytype - = lookup_array_range_type (value_type (elt), 0, copies - 1); - result = allocate_value (arraytype); - } + return eval_op_rust_array (expect_type, exp, noside, elt, ncopies); } break; -- 2.26.2