From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CCToJ3iY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:36 -0500 Received: by simark.ca (Postfix, from userid 112) id A02141F0BA; Fri, 1 Jan 2021 16:47:36 -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 6B17C1F071 for ; Fri, 1 Jan 2021 16:47:35 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1F3A0386EC42; Fri, 1 Jan 2021 21:47:35 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 533CD3844015 for ; Fri, 1 Jan 2021 21:47:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 533CD3844015 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 EA37029017 for ; Fri, 1 Jan 2021 15:47:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGgkJA8huDoAvSGgkcc4Q; Fri, 01 Jan 2021 15:47:30 -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=wGXoLFUe3sIzx0Sq0+ZqGRdtN9PSFK2jAhXSuEYiq8s=; b=uLX/tlkfQbQjF0Wpp7r8lQ0Nzo hhfTuYKoAtj+pWBNYPhqU7LoE9jOG63+NS6R9/pUK5PYAx+VMqm8h4eACyHejo/3zdGbshv3CUmms RI8KxgzLQBSZEv/+zy5rQbLPC; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60374 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 1kvSGg-00292J-MS for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:30 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 010/203] Split out eval_op_ternop Date: Fri, 1 Jan 2021 14:44:10 -0700 Message-Id: <20210101214723.1784144-11-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: 1kvSGg-00292J-MS X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60374 X-Source-Auth: tom+tromey.com X-Email-Count: 11 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 splits TERNOP_SLICE into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_ternop): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 24 +++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index f2507f25f44..f4af89bf928 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1309,6 +1309,20 @@ eval_op_concat (struct type *expect_type, struct expression *exp, return value_concat (arg1, arg2); } +/* A helper function for TERNOP_SLICE. */ + +static struct value * +eval_op_ternop (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *array, struct value *low, struct value *upper) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + int lowbound = value_as_long (low); + int upperbound = value_as_long (upper); + return value_slice (array, lowbound, upperbound - lowbound + 1); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -1564,13 +1578,9 @@ evaluate_subexp_standard (struct type *expect_type, case TERNOP_SLICE: { struct value *array = evaluate_subexp (nullptr, exp, pos, noside); - int lowbound - = value_as_long (evaluate_subexp (nullptr, exp, pos, noside)); - int upper = value_as_long (evaluate_subexp (nullptr, exp, pos, noside)); - - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - return value_slice (array, lowbound, upper - lowbound + 1); + struct value *low = evaluate_subexp (nullptr, exp, pos, noside); + struct value *upper = evaluate_subexp (nullptr, exp, pos, noside); + return eval_op_ternop (expect_type, exp, noside, array, low, upper); } case TERNOP_COND: -- 2.26.2