From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 0717B386F447 for ; Fri, 1 Jan 2021 21:47:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0717B386F447 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id A3149B35146 for ; Fri, 1 Jan 2021 15:47:40 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGqkzaoRDT64vSGqk78sO; 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=Ee7/itzEI1nVdrK9RNNBTa6OaYQFdkrJrrYs+vbH3Y4=; b=IXQxQmHf5BpbndyYLSk8FGsh6G Wavm1xqFO3B/xGElIOPeENFAhvBcx/sbkGUP7IzrgPUCM6uIunjC8hXXaq0c9GqMPcHM+YEL4qpCu NqThBNcJV8mfvqGYqJRtMShxc; 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 1kvSGq-00297n-FU for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:40 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 032/203] Split out eval_op_preinc Date: Fri, 1 Jan 2021 14:44:32 -0700 Message-Id: <20210101214723.1784144-33-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: 1kvSGq-00297n-FU 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: 33 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3033.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Fri, 01 Jan 2021 21:47:42 -0000 This splits UNOP_PREINCREMENT into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_preinc): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 53 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 54ccf510db2..1f916c7d3bb 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1884,6 +1884,37 @@ eval_op_memval (struct type *expect_type, struct expression *exp, return value_at_lazy (type, value_as_address (arg1)); } +/* A helper function for UNOP_PREINCREMENT. */ + +static struct value * +eval_op_preinc (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1) +{ + if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + return arg1; + else if (unop_user_defined_p (op, arg1)) + { + return value_x_unop (arg1, op, noside); + } + else + { + struct value *arg2; + if (ptrmath_type_p (exp->language_defn, value_type (arg1))) + arg2 = value_ptradd (arg1, 1); + else + { + struct value *tmp = arg1; + + arg2 = value_one (value_type (arg1)); + binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); + arg2 = value_binop (tmp, arg2, BINOP_ADD); + } + + return value_assign (arg1, arg2); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2818,27 +2849,7 @@ evaluate_subexp_standard (struct type *expect_type, case UNOP_PREINCREMENT: arg1 = evaluate_subexp (expect_type, exp, pos, noside); - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; - else if (unop_user_defined_p (op, arg1)) - { - return value_x_unop (arg1, op, noside); - } - else - { - if (ptrmath_type_p (exp->language_defn, value_type (arg1))) - arg2 = value_ptradd (arg1, 1); - else - { - struct value *tmp = arg1; - - arg2 = value_one (value_type (arg1)); - binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); - arg2 = value_binop (tmp, arg2, BINOP_ADD); - } - - return value_assign (arg1, arg2); - } + return eval_op_preinc (expect_type, exp, noside, op, arg1); case UNOP_PREDECREMENT: arg1 = evaluate_subexp (expect_type, exp, pos, noside); -- 2.26.2