From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wHogJ5iY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:08 -0500 Received: by simark.ca (Postfix, from userid 112) id 9165A1E590; Fri, 1 Jan 2021 16:48:08 -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 DFF1B1F0AA for ; Fri, 1 Jan 2021 16:48:04 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17730389042E; Fri, 1 Jan 2021 21:47:57 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 33C7B389040F for ; Fri, 1 Jan 2021 21:47:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 33C7B389040F 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 D22922C200 for ; Fri, 1 Jan 2021 15:47:52 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH2kJAKIuDoAvSH2kccFy; 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=9CfYzdXxXWc4Jb8fyMVmIScTst1+f67MD7wQTgrj044=; b=F1h1eW8fsnrt5QrBAofl868I+w h2YI02KaRuQUON6QaWS7us9S4E8AsKlKHMf9h/dDSN69m6uYacCIVbW/Lj6xbx/O68N5ieYi5+HFs 9+8hhz00HUMsDXDyWv6a48HyF; 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-MP for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 058/203] Split out ada_unop_neg Date: Fri, 1 Jan 2021 14:44:58 -0700 Message-Id: <20210101214723.1784144-59-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-MP 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: 59 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 UNOP_NEG into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_unop_neg): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 29 ++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 4cf6335ceb5..b071c3d3f65 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10106,6 +10106,25 @@ eval_ternop_in_range (struct type *expect_type, struct expression *exp, || value_equal (arg2, arg1))); } +/* A helper function for UNOP_NEG. */ + +static value * +ada_unop_neg (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + else if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1))) + return value_cast (value_type (arg1), value_neg (arg1)); + else + { + unop_promote (exp->language_defn, exp->gdbarch, &arg1); + return value_neg (arg1); + } +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ @@ -10300,15 +10319,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, case UNOP_NEG: arg1 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - else if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1))) - return value_cast (value_type (arg1), value_neg (arg1)); - else - { - unop_promote (exp->language_defn, exp->gdbarch, &arg1); - return value_neg (arg1); - } + return ada_unop_neg (expect_type, exp, noside, op, arg1); case BINOP_LOGICAL_AND: case BINOP_LOGICAL_OR: -- 2.26.2