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 47B85395042D for ; Sat, 20 Feb 2021 20:16:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 47B85395042D 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 gateway36.websitewelcome.com (Postfix) with ESMTP id B5599400C8F9F for ; Sat, 20 Feb 2021 14:16:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYfyldOTwHPnUDYfyl4D1Z; Sat, 20 Feb 2021 14:16:26 -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=4jLnIkFZPKGFYsQkIQP5Xn3cQRiXVtEZWCYFUmYAkEs=; b=mnsnlTcrQqpTNzmYFzakb9QgBo WBWq46G6UwlF+B3CCKag2GUUFwet5XdIP4qUi2pf1sY3sOY2vXKslbuh7VAIh4TeVtoBXhAbvmxTQ PN/nBsT4jQzHDGy/r1dO7jH36; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52684 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 1lDYfy-000GOP-Hv for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 062/206] Split out ada_atr_size Date: Sat, 20 Feb 2021 13:13:45 -0700 Message-Id: <20210220201609.838264-63-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: 1lDYfy-000GOP-Hv X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52684 X-Source-Auth: tom+tromey.com X-Email-Count: 63 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.9 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:16:38 -0000 This splits OP_ATR_SIZE into a new function for future use. gdb/ChangeLog 2021-02-20 Tom Tromey * ada-lang.c (ada_atr_size): New function. (ada_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a825d5f2c3f..05076f223b3 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10195,6 +10195,31 @@ ada_atr_tag (struct type *expect_type, return ada_value_tag (arg1); } +/* A helper function for OP_ATR_SIZE. */ + +static value * +ada_atr_size (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1) +{ + struct type *type = value_type (arg1); + + /* If the argument is a reference, then dereference its type, since + the user is really asking for the size of the actual object, + not the size of the pointer. */ + if (type->code () == TYPE_CODE_REF) + type = TYPE_TARGET_TYPE (type); + + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (builtin_type (exp->gdbarch)->builtin_int, not_lval); + else + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, + TARGET_CHAR_BIT * TYPE_LENGTH (type)); +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ @@ -10996,21 +11021,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, case OP_ATR_SIZE: arg1 = evaluate_subexp (nullptr, exp, pos, noside); - type = value_type (arg1); - - /* If the argument is a reference, then dereference its type, since - the user is really asking for the size of the actual object, - not the size of the pointer. */ - if (type->code () == TYPE_CODE_REF) - type = TYPE_TARGET_TYPE (type); - - if (noside == EVAL_SKIP) - goto nosideret; - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (builtin_type (exp->gdbarch)->builtin_int, not_lval); - else - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, - TARGET_CHAR_BIT * TYPE_LENGTH (type)); + return ada_atr_size (expect_type, exp, noside, op, arg1); case OP_ATR_VAL: evaluate_subexp (nullptr, exp, pos, EVAL_SKIP); -- 2.26.2