From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6HsJEHyY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:40 -0500 Received: by simark.ca (Postfix, from userid 112) id 402641F0AA; Fri, 1 Jan 2021 16:47:40 -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 9C9761F0BC for ; Fri, 1 Jan 2021 16:47:36 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0F659386EC70; Fri, 1 Jan 2021 21:47:36 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 300F9386EC3A for ; Fri, 1 Jan 2021 21:47:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 300F9386EC3A 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id C702BA6E32D for ; Fri, 1 Jan 2021 15:47:31 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGhka1AHnPrxvSGhkldc0; Fri, 01 Jan 2021 15:47:31 -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=MqnzEiIoYBwgl0j8tbbRcHQ7fGnn3Sya6VTB+MTKli4=; b=Odq3R5HU6jQhtiLZi8f810q2Vb k4P96wgmd97dLiD3wDfUfjKGf2J2EwQB8piEsz7FcMe9BH36Nx/OOsXv/QXyijIwhTkdOuF48jF6e 4mZ6yfXHt4pwGCLEIe+gnHgRT; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60374 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 1kvSGh-00292J-Io for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:31 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 013/203] Split out eval_op_member Date: Fri, 1 Jan 2021 14:44:13 -0700 Message-Id: <20210101214723.1784144-14-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: 1kvSGh-00292J-Io X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60374 X-Source-Auth: tom+tromey.com X-Email-Count: 14 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 STRUCTOP_MEMBER into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_member): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 ++++ gdb/eval.c | 76 +++++++++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 8164f2f4e3a..cc05b331b19 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1398,6 +1398,49 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp, return arg3; } +/* A helper function for STRUCTOP_MEMBER. */ + +static struct value * +eval_op_member (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2) +{ + long mem_offset; + + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + + struct value *arg3; + struct type *type = check_typedef (value_type (arg2)); + switch (type->code ()) + { + case TYPE_CODE_METHODPTR: + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (TYPE_TARGET_TYPE (type), not_lval); + else + { + arg2 = cplus_method_ptr_to_value (&arg1, arg2); + gdb_assert (value_type (arg2)->code () == TYPE_CODE_PTR); + return value_ind (arg2); + } + + case TYPE_CODE_MEMBERPTR: + /* Now, convert these values to an address. */ + arg1 = value_cast_pointers (lookup_pointer_type (TYPE_SELF_TYPE (type)), + arg1, 1); + + mem_offset = value_as_long (arg2); + + arg3 = value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)), + value_as_long (arg1) + mem_offset); + return value_ind (arg3); + + default: + error (_("non-pointer-to-member value used " + "in pointer-to-member construct")); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -1413,7 +1456,6 @@ evaluate_subexp_standard (struct type *expect_type, int nargs; struct value **argvec; int ix; - long mem_offset; struct type **arg_types; pc = (*pos)++; @@ -2008,37 +2050,7 @@ evaluate_subexp_standard (struct type *expect_type, arg2 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - - type = check_typedef (value_type (arg2)); - switch (type->code ()) - { - case TYPE_CODE_METHODPTR: - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (TYPE_TARGET_TYPE (type), not_lval); - else - { - arg2 = cplus_method_ptr_to_value (&arg1, arg2); - gdb_assert (value_type (arg2)->code () == TYPE_CODE_PTR); - return value_ind (arg2); - } - - case TYPE_CODE_MEMBERPTR: - /* Now, convert these values to an address. */ - arg1 = value_cast_pointers (lookup_pointer_type (TYPE_SELF_TYPE (type)), - arg1, 1); - - mem_offset = value_as_long (arg2); - - arg3 = value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)), - value_as_long (arg1) + mem_offset); - return value_ind (arg3); - - default: - error (_("non-pointer-to-member value used " - "in pointer-to-member construct")); - } + return eval_op_member (expect_type, exp, noside, arg1, arg2); case TYPE_INSTANCE: { -- 2.26.2