From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id IDF3KIaY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:50 -0500 Received: by simark.ca (Postfix, from userid 112) id 94E3C1E590; Fri, 1 Jan 2021 16:47:47 -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.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, 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 B34B81F0BC for ; Fri, 1 Jan 2021 16:47:46 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D52AC386F478; Fri, 1 Jan 2021 21:47:43 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 88A72386F439 for ; Fri, 1 Jan 2021 21:47:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 88A72386F439 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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 2659E2B874 for ; Fri, 1 Jan 2021 15:47:40 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGqk10cdiQiZvSGqki7oM; Fri, 01 Jan 2021 15:47:40 -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=IUQGQ/zeCCpeUo40cvsYPDlLwTJSqEalzsIIhyEFZc8=; b=ht3RqmyTy+Ulf9Yvb2mJnyWoUW mvs+tR2KfTEGoomOpelu5L3SaeTWu9m5mBvTclwWdxHZ6ObjlDGWPChxNo1+utGVaYDXKACufgtsc e7IR9Sjw6x3xjx6wZu088TGCZ; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60378 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 1kvSGp-00297n-Uu for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:40 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 029/203] Split out eval_op_ind Date: Fri, 1 Jan 2021 14:44:29 -0700 Message-Id: <20210101214723.1784144-30-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: 1kvSGp-00297n-Uu X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60378 X-Source-Auth: tom+tromey.com X-Email-Count: 30 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 UNOP_IND into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_ind): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 ++++ gdb/eval.c | 80 +++++++++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index b2e429b2e8c..3626c8c9be2 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1809,6 +1809,50 @@ eval_op_lognot (struct type *expect_type, struct expression *exp, } } +/* A helper function for UNOP_IND. */ + +static struct value * +eval_op_ind (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1) +{ + struct type *type = check_typedef (value_type (arg1)); + if (type->code () == TYPE_CODE_METHODPTR + || type->code () == TYPE_CODE_MEMBERPTR) + error (_("Attempt to dereference pointer " + "to member without an object")); + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + if (unop_user_defined_p (op, arg1)) + return value_x_unop (arg1, op, noside); + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + type = check_typedef (value_type (arg1)); + if (type->code () == TYPE_CODE_PTR + || TYPE_IS_REFERENCE (type) + /* In C you can dereference an array to get the 1st elt. */ + || type->code () == TYPE_CODE_ARRAY + ) + return value_zero (TYPE_TARGET_TYPE (type), + lval_memory); + else if (type->code () == TYPE_CODE_INT) + /* GDB allows dereferencing an int. */ + return value_zero (builtin_type (exp->gdbarch)->builtin_int, + lval_memory); + else + error (_("Attempt to take contents of a non-pointer value.")); + } + + /* Allow * on an integer so we can cast it to whatever we want. + This returns an int, which seems like the most C-like thing to + do. "long long" variables are rare enough that + BUILTIN_TYPE_LONGEST would seem to be a mistake. */ + if (type->code () == TYPE_CODE_INT) + return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int, + (CORE_ADDR) value_as_address (arg1)); + return value_ind (arg1); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2678,41 +2722,7 @@ evaluate_subexp_standard (struct type *expect_type, if (expect_type && expect_type->code () == TYPE_CODE_PTR) expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type)); arg1 = evaluate_subexp (expect_type, exp, pos, noside); - type = check_typedef (value_type (arg1)); - if (type->code () == TYPE_CODE_METHODPTR - || type->code () == TYPE_CODE_MEMBERPTR) - error (_("Attempt to dereference pointer " - "to member without an object")); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - if (unop_user_defined_p (op, arg1)) - return value_x_unop (arg1, op, noside); - else if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - type = check_typedef (value_type (arg1)); - if (type->code () == TYPE_CODE_PTR - || TYPE_IS_REFERENCE (type) - /* In C you can dereference an array to get the 1st elt. */ - || type->code () == TYPE_CODE_ARRAY - ) - return value_zero (TYPE_TARGET_TYPE (type), - lval_memory); - else if (type->code () == TYPE_CODE_INT) - /* GDB allows dereferencing an int. */ - return value_zero (builtin_type (exp->gdbarch)->builtin_int, - lval_memory); - else - error (_("Attempt to take contents of a non-pointer value.")); - } - - /* Allow * on an integer so we can cast it to whatever we want. - This returns an int, which seems like the most C-like thing to - do. "long long" variables are rare enough that - BUILTIN_TYPE_LONGEST would seem to be a mistake. */ - if (type->code () == TYPE_CODE_INT) - return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int, - (CORE_ADDR) value_as_address (arg1)); - return value_ind (arg1); + return eval_op_ind (expect_type, exp, noside, op, arg1); case UNOP_ADDR: /* C++: check for and handle pointer to members. */ -- 2.26.2