From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2G/WNpyY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:12 -0500 Received: by simark.ca (Postfix, from userid 112) id DB5A21E590; Fri, 1 Jan 2021 16:48:12 -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 A0BA01F0AA for ; Fri, 1 Jan 2021 16:48:10 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D756D3892440; Fri, 1 Jan 2021 21:47:59 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 17A4D389042F for ; Fri, 1 Jan 2021 21:47:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 17A4D389042F 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id AEF73BEC5C2 for ; Fri, 1 Jan 2021 15:47:56 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH6ka1NGnPrxvSH6kldoq; Fri, 01 Jan 2021 15:47:56 -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=WCgE9vvKPqakmhH4w0NDyy7Xz2UIxhpC7veRn4Ns38A=; b=wsStVIKx8lIwMmzjDbwXAMgbor UZjdGw5pLdJSOHH12uD6h9fT0YnCEnfGqHxVUtts/iEgWvpU/ZuNiyQrA/bdrTYGA/OU3AmHKxYDL GDR8DcbXy/jOLf1PoTq0gZeR1; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60388 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 1kvSH6-0029JW-H0 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:56 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 066/203] Split out ada_binop_in_bounds Date: Fri, 1 Jan 2021 14:45:06 -0700 Message-Id: <20210101214723.1784144-67-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: 1kvSH6-0029JW-H0 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60388 X-Source-Auth: tom+tromey.com X-Email-Count: 67 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 BINOP_IN_BOUNDS into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_binop_in_bounds): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 53 +++++++++++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index dd909d2f41e..bc5fc618161 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10344,6 +10344,36 @@ ada_ternop_slice (struct expression *exp, longest_to_int (high_bound)); } +/* A helper function for BINOP_IN_BOUNDS. */ + +static value * +ada_binop_in_bounds (struct expression *exp, enum noside noside, + struct value *arg1, struct value *arg2, int n) +{ + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + struct type *type = language_bool_type (exp->language_defn, + exp->gdbarch); + return value_zero (type, not_lval); + } + + struct type *type = ada_index_type (value_type (arg2), n, "range"); + if (!type) + type = value_type (arg1); + + value *arg3 = value_from_longest (type, ada_array_bound (arg2, n, 1)); + arg2 = value_from_longest (type, ada_array_bound (arg2, n, 0)); + + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); + type = language_bool_type (exp->language_defn, exp->gdbarch); + return value_from_longest (type, + (value_less (arg1, arg3) + || value_equal (arg1, arg3)) + && (value_less (arg2, arg1) + || value_equal (arg2, arg1))); +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ @@ -10807,30 +10837,9 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, if (noside == EVAL_SKIP) goto nosideret; - if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - type = language_bool_type (exp->language_defn, exp->gdbarch); - return value_zero (type, not_lval); - } - tem = longest_to_int (exp->elts[pc + 1].longconst); - type = ada_index_type (value_type (arg2), tem, "range"); - if (!type) - type = value_type (arg1); - - arg3 = value_from_longest (type, ada_array_bound (arg2, tem, 1)); - arg2 = value_from_longest (type, ada_array_bound (arg2, tem, 0)); - - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); - type = language_bool_type (exp->language_defn, exp->gdbarch); - return - value_from_longest (type, - (value_less (arg1, arg3) - || value_equal (arg1, arg3)) - && (value_less (arg2, arg1) - || value_equal (arg2, arg1))); + return ada_binop_in_bounds (exp, noside, arg1, arg2, tem); case TERNOP_IN_RANGE: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2