From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [50.116.126.2]) by sourceware.org (Postfix) with ESMTPS id 0130F396AC35 for ; Sat, 20 Feb 2021 20:16:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0130F396AC35 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 gateway36.websitewelcome.com (Postfix) with ESMTP id 66B7F400D1ECD for ; Sat, 20 Feb 2021 14:16:55 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgRlmUJ0DT64DYgRlULu4; Sat, 20 Feb 2021 14:16:55 -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=joNaN539mu2+CXGKsrgqiXArTGwb7Ejmpcd5+AhgAUg=; b=wGB1y6gsgZ6ggQFlwTnBf4qNjw 5HjeLSKnI7NWoWwb40NK+QGDY6T4aSmR0/YLav4c9PgSrW2LAicvGqLkId4munsaGmANOcPztXpJH NRG1TIAZPCQL8oAXK89xk2MlR; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52710 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 1lDYgQ-000GwS-QQ for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:54 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 194/206] Remove two Ada opcodes Date: Sat, 20 Feb 2021 13:15:57 -0700 Message-Id: <20210220201609.838264-195-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYgQ-000GwS-QQ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52710 X-Source-Auth: tom+tromey.com X-Email-Count: 195 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Sat, 20 Feb 2021 20:17:20 -0000 The OP_ATR_MIN and OP_ATR_MAX constants aren't truly needed. Internally, they are converted to BINOP_MIN and BINOP_MAX. This patch removes them in favor of simple reuse. gdb/ChangeLog 2021-02-20 Tom Tromey * std-operator.def (OP_ATR_MIN, OP_ATR_MAX): Remove. * ada-lang.c (ada_binop_minmax): Update. * ada-exp.h (ada_binop_min_operation, ada_binop_max_operation): Use BINOP_MIN and BINOP_MAX. --- gdb/ChangeLog | 7 +++++++ gdb/ada-exp.h | 4 ++-- gdb/ada-lang.c | 3 +-- gdb/std-operator.def | 2 -- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 1ae0cbc3546..0b6f1f22e79 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -213,8 +213,8 @@ using ada_binop_div_operation = binop_operation; using ada_binop_rem_operation = binop_operation; using ada_binop_mod_operation = binop_operation; -using ada_binop_min_operation = binop_operation; -using ada_binop_max_operation = binop_operation; +using ada_binop_min_operation = binop_operation; +using ada_binop_max_operation = binop_operation; using ada_binop_exp_operation = binop_operation; diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index ea0f91845c3..36d37b6aa85 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10264,8 +10264,7 @@ ada_binop_minmax (struct type *expect_type, else { binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - return value_binop (arg1, arg2, - op == OP_ATR_MIN ? BINOP_MIN : BINOP_MAX); + return value_binop (arg1, arg2, op); } } diff --git a/gdb/std-operator.def b/gdb/std-operator.def index f3533aa3908..db24fc9c172 100644 --- a/gdb/std-operator.def +++ b/gdb/std-operator.def @@ -359,8 +359,6 @@ OP (OP_ATR_FIRST) OP (OP_ATR_LAST) OP (OP_ATR_LENGTH) OP (OP_ATR_IMAGE) -OP (OP_ATR_MAX) -OP (OP_ATR_MIN) OP (OP_ATR_MODULUS) OP (OP_ATR_POS) OP (OP_ATR_SIZE) -- 2.26.2