From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AFM1IpiY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:08 -0500 Received: by simark.ca (Postfix, from userid 112) id 0571B1F0BE; Fri, 1 Jan 2021 16:48:06 -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 732741F0C0 for ; Fri, 1 Jan 2021 16:48:03 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C26FE389042B; Fri, 1 Jan 2021 21:47:56 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 0CA863890407 for ; Fri, 1 Jan 2021 21:47:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0CA863890407 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 cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id AC684400C8B30 for ; Fri, 1 Jan 2021 15:47:52 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH2kyO4dsvw9vSH2kLu5o; Fri, 01 Jan 2021 15:47:52 -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=h5nZOduq81XCDC4eN3ExQVX3bqWX6h8JVREmBOzeaAw=; b=KA0xN+lJWmMmIPKZVzh/naPC5x fAh16hVnRml4/xxQffOK8ZgGsDROucTuArSSqSL+dL/8COUYuSwXZt5YGv+qg4X0aWjoIiylZZq7P lKFayFnQrX9OMfAqvI6IIOXjW; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60386 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 1kvSH2-0029HC-Gv for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 057/203] Split out eval_ternop_in_range Date: Fri, 1 Jan 2021 14:44:57 -0700 Message-Id: <20210101214723.1784144-58-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: 1kvSH2-0029HC-Gv X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60386 X-Source-Auth: tom+tromey.com X-Email-Count: 58 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_IN_RANGE into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (eval_ternop_in_range): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 34 ++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 8b2086109b9..4cf6335ceb5 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10085,6 +10085,27 @@ ada_evaluate_subexp_for_cast (expression *exp, int *pos, return ada_value_cast (to_type, val); } +/* A helper function for TERNOP_IN_RANGE. */ + +static value * +eval_ternop_in_range (struct type *expect_type, struct expression *exp, + enum noside noside, + value *arg1, value *arg2, value *arg3) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); + struct type *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. */ @@ -10703,18 +10724,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, arg2 = evaluate_subexp (nullptr, exp, pos, noside); arg3 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - - 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 eval_ternop_in_range (expect_type, exp, noside, arg1, arg2, arg3); case OP_ATR_FIRST: case OP_ATR_LAST: -- 2.26.2