From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wEk3KIeY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:51 -0500 Received: by simark.ca (Postfix, from userid 112) id 7A0181F0BA; Fri, 1 Jan 2021 16:47:51 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,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 C13E01E590 for ; Fri, 1 Jan 2021 16:47:50 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F8DE384243B; Fri, 1 Jan 2021 21:47:45 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 5DE55386F430 for ; Fri, 1 Jan 2021 21:47:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5DE55386F430 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 cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 0612DB35143 for ; Fri, 1 Jan 2021 15:47:41 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGqkZEVcoE4DvSGqkuGvT; Fri, 01 Jan 2021 15:47:41 -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=eyYiLpF5KgT0Wb+h7FHxnb+KZ9TwJseCUXiDJPAZADI=; b=HJJc1YfnZlXsw3OsTmbXELV1iG VfF6Nwlox4VU+/PvORa5GVJiic4Ynce5WlSQY0OCEm/M57r/5TW2fvnGE9X6Cp38MFy1YMs/dFOc0 czRHI4c1KVBDyZr/Luhl3Arcp; 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-QF for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:40 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 034/203] Split out eval_op_postinc Date: Fri, 1 Jan 2021 14:44:34 -0700 Message-Id: <20210101214723.1784144-35-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-QF 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: 35 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_POSTINCREMENT into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_postinc): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 59 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index c8e2c14b8b0..82215d32d0d 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1946,6 +1946,40 @@ eval_op_predec (struct type *expect_type, struct expression *exp, } } +/* A helper function for UNOP_POSTINCREMENT. */ + +static struct value * +eval_op_postinc (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 *arg3 = value_non_lval (arg1); + 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); + } + + value_assign (arg1, arg2); + return arg3; + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2888,30 +2922,7 @@ evaluate_subexp_standard (struct type *expect_type, case UNOP_POSTINCREMENT: 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 - { - arg3 = value_non_lval (arg1); - - 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); - } - - value_assign (arg1, arg2); - return arg3; - } + return eval_op_postinc (expect_type, exp, noside, op, arg1); case UNOP_POSTDECREMENT: arg1 = evaluate_subexp (expect_type, exp, pos, noside); -- 2.26.2