From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iPj6C5uY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:11 -0500 Received: by simark.ca (Postfix, from userid 112) id 2F98E1F0BC; Fri, 1 Jan 2021 16:48:11 -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 251661F071 for ; Fri, 1 Jan 2021 16:48:09 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41E7F3892447; 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 BA89D389042A for ; Fri, 1 Jan 2021 21:47:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BA89D389042A 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 5D869B9EB47 for ; Fri, 1 Jan 2021 15:47:56 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH6kzavzDT64vSH6k78zr; 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=ln13v+TAs2tUPHaV5BOrCNtKd/iKiGk5LA9rhocDxsg=; b=F/utKfpRpQ1p40982fYLDt03Ki rabTAif+IhjVNQg90ksSD0bbmB9K7uHXiX97jZ7mJ1plnUaXVGyIlNvHcdizrI//PGLC3zkl+TAfB 2R8aFwoWZK5v3NZhRRY6vhH88; 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-5z for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:56 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 064/203] Split out ada_equal_binop Date: Fri, 1 Jan 2021 14:45:04 -0700 Message-Id: <20210101214723.1784144-65-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-5z 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: 65 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_EQUAL and BINOP_NOTEQUAL into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_equal_binop): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f096157881a..47ff8b0e0f5 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10241,6 +10241,28 @@ ada_mult_binop (struct type *expect_type, } } +/* A helper function for BINOP_EQUAL and BINOP_NOTEQUAL. */ + +static value * +ada_equal_binop (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) +{ + int tem; + if (noside == EVAL_AVOID_SIDE_EFFECTS) + tem = 0; + else + { + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + tem = ada_value_equal (arg1, arg2); + } + if (op == BINOP_NOTEQUAL) + tem = !tem; + struct type *type = language_bool_type (exp->language_defn, exp->gdbarch); + return value_from_longest (type, (LONGEST) tem); +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ @@ -10408,17 +10430,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); if (noside == EVAL_SKIP) goto nosideret; - if (noside == EVAL_AVOID_SIDE_EFFECTS) - tem = 0; - else - { - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - tem = ada_value_equal (arg1, arg2); - } - if (op == BINOP_NOTEQUAL) - tem = !tem; - type = language_bool_type (exp->language_defn, exp->gdbarch); - return value_from_longest (type, (LONGEST) tem); + return ada_equal_binop (expect_type, exp, noside, op, arg1, arg2); case UNOP_NEG: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2