From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8HA6AMqY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:58 -0500 Received: by simark.ca (Postfix, from userid 112) id C9CE01F0B8; Fri, 1 Jan 2021 16:48:57 -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 AC5951E590 for ; Fri, 1 Jan 2021 16:48:53 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9FE93896822; Fri, 1 Jan 2021 21:48:28 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 47EDD3894C3E for ; Fri, 1 Jan 2021 21:48:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 47EDD3894C3E 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 cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway31.websitewelcome.com (Postfix) with ESMTP id E6C613186C for ; Fri, 1 Jan 2021 15:48:24 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHYkJAbWuDoAvSHYkccWu; Fri, 01 Jan 2021 15:48:24 -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=mDln+Rr5m7fHROxUmlTwlixvHiacaac0AVDz9qCP7g8=; b=CXNkusIeSdfhZAKEb4i6bXVSuc WDzb4sBsBbF+njdpUA7u2FiQGzbSrUNuPFpOgdYwYZXYfjbaOUoY9gfEigez9RpuBWIf8uwY2d7Fy RSzznIsadb+apidQwDR2HpYKc; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60410 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 1kvSHY-0029f3-OY for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:24 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 123/203] Introduce objc_msgcall_operation Date: Fri, 1 Jan 2021 14:46:03 -0700 Message-Id: <20210101214723.1784144-124-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: 1kvSHY-0029f3-OY X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60410 X-Source-Auth: tom+tromey.com X-Email-Count: 124 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 adds class objc_msgcall_operation, which implements OP_OBJC_MSGCALL. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (objc_msgcall_operation::evaluate): New method. * c-exp.h (class objc_msgcall_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/c-exp.h | 17 +++++++++++++++++ gdb/eval.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/gdb/c-exp.h b/gdb/c-exp.h index dcb4557b2d5..2d224c8c633 100644 --- a/gdb/c-exp.h +++ b/gdb/c-exp.h @@ -88,6 +88,23 @@ class objc_selector_operation { return OP_OBJC_SELECTOR; } }; +/* An Objective C message call. */ +class objc_msgcall_operation + : public tuple_holding_operation> +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return OP_OBJC_MSGCALL; } +}; + }/* namespace expr */ #endif /* C_EXP_H */ diff --git a/gdb/eval.c b/gdb/eval.c index 4b12875f00c..05fc1972a0e 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2411,6 +2411,45 @@ eval_multi_subscript (struct type *expect_type, struct expression *exp, return (arg1); } +namespace expr +{ + +value * +objc_msgcall_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + enum noside sub_no_side = EVAL_NORMAL; + struct type *selector_type = builtin_type (exp->gdbarch)->builtin_data_ptr; + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + sub_no_side = EVAL_NORMAL; + else + sub_no_side = noside; + value *target + = std::get<1> (m_storage)->evaluate (selector_type, exp, sub_no_side); + + if (value_as_long (target) == 0) + sub_no_side = EVAL_AVOID_SIDE_EFFECTS; + else + sub_no_side = noside; + std::vector &args = std::get<2> (m_storage); + value **argvec = XALLOCAVEC (struct value *, args.size () + 3); + argvec[0] = nullptr; + argvec[1] = nullptr; + for (int i = 0; i < args.size (); ++i) + argvec[i + 2] = args[i]->evaluate_with_coercion (exp, sub_no_side); + argvec[args.size () + 2] = nullptr; + + return eval_op_objc_msgcall (expect_type, exp, noside, std:: + get<0> (m_storage), target, + gdb::make_array_view (argvec, + args.size () + 3)); +} + +} + + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, -- 2.26.2