From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uPFVI+WY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:25 -0500 Received: by simark.ca (Postfix, from userid 112) id 8AB141F0C6; Fri, 1 Jan 2021 16:49:25 -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 E8F241F0C0 for ; Fri, 1 Jan 2021 16:49:20 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7405B3899434; Fri, 1 Jan 2021 21:48:51 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id 39B4F3898505 for ; Fri, 1 Jan 2021 21:48:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 39B4F3898505 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 D9606575B for ; Fri, 1 Jan 2021 15:48:46 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHukXBASHPnUvSHukgztM; Fri, 01 Jan 2021 15:48:46 -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=/0adKrPtKRuSLrP0CJz81++aDN8D483+GxrL+KV+kb0=; b=fhuzOYtGGAM2LnTuBu3AopiwEj CI8pZQHFTQERAisiMdDUmaGYpOEo47DmDw2fY5PoEcpT5UYuudJncxx1wUouuYJl5iCiJ9kfME9lh p+aRzxjS9D54/3pEsiGAXZpye; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60422 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 1kvSHu-0029t6-L1 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:46 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 162/203] Refactor value_pos_atr Date: Fri, 1 Jan 2021 14:46:42 -0700 Message-Id: <20210101214723.1784144-163-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: 1kvSHu-0029t6-L1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60422 X-Source-Auth: tom+tromey.com X-Email-Count: 163 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 refactors value_pos_atr to be directly usable by a new operation implementation. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_pos_atr): Rename from value_pos_atr. Change parameters. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 6 ++++++ gdb/ada-lang.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index b3278183177..4a83e9f57a5 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -191,8 +191,6 @@ static struct value *ada_coerce_ref (struct value *); static LONGEST pos_atr (struct value *); -static struct value *value_pos_atr (struct type *, struct value *); - static struct value *val_atr (struct type *, LONGEST); static struct symbol *standard_lookup (const char *, const struct block *, @@ -8963,8 +8961,14 @@ pos_atr (struct value *arg) } static struct value * -value_pos_atr (struct type *type, struct value *arg) +ada_pos_atr (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg) { + struct type *type = builtin_type (exp->gdbarch)->builtin_int; + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (type, not_lval); return value_from_longest (type, pos_atr (arg)); } @@ -11373,11 +11377,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, arg1 = evaluate_subexp (nullptr, exp, pos, noside); if (noside == EVAL_SKIP) goto nosideret; - type = builtin_type (exp->gdbarch)->builtin_int; - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (type, not_lval); - else - return value_pos_atr (type, arg1); + return ada_pos_atr (expect_type, exp, noside, op, arg1); case OP_ATR_SIZE: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2