From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WIL9Dv6Y71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:50 -0500 Received: by simark.ca (Postfix, from userid 112) id 348EC1F0B8; Fri, 1 Jan 2021 16:49:50 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 A6F851F0C6 for ; Fri, 1 Jan 2021 16:49:40 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6413B393BC04; Fri, 1 Jan 2021 21:49:06 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id E3A2B3939C0D for ; Fri, 1 Jan 2021 21:49:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E3A2B3939C0D 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id A95AF4036 for ; Fri, 1 Jan 2021 15:49:02 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSIAkXBJ6HPnUvSIAkh01u; Fri, 01 Jan 2021 15:49:02 -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=Cq8ncLBH4tblwo5Vgn2oW2HAupw9eHJP5e3XJWiHwxU=; b=GWFImhDYEFEBdxb3YWopfFWWpk spX2gQVSDLIfU0i+9A0s8t+bHUcFkDL9pggb27l4U1GC1bv+36HlvTnzUZnhRtlbuAUGSZxLdgpWa q/n8JwZl8fS+ZcaJF2Q4Npkp8; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60428 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 1kvSIA-002A3B-Gb for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:49:02 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 191/203] Remove two Ada opcodes Date: Fri, 1 Jan 2021 14:47:11 -0700 Message-Id: <20210101214723.1784144-192-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: 1kvSIA-002A3B-Gb X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60428 X-Source-Auth: tom+tromey.com X-Email-Count: 192 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" 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-01-01 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 7dfc64e2ec7..b215c58dfb3 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -195,8 +195,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 e7bfe9967e9..4331a063cb0 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10265,8 +10265,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 925e2b6484e..de3d9ec18a9 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