From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OGB4HJWY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:05 -0500 Received: by simark.ca (Postfix, from userid 112) id 6F3D81F0BC; Fri, 1 Jan 2021 16:48:05 -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 ACFC01E590 for ; Fri, 1 Jan 2021 16:48:02 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2DA253890412; Fri, 1 Jan 2021 21:47:56 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 95BEC3890401 for ; Fri, 1 Jan 2021 21:47:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 95BEC3890401 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 393CD2C1F8 for ; Fri, 1 Jan 2021 15:47:52 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH2kJAJzuDoAvSH2kccFf; Fri, 01 Jan 2021 15:47:52 -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=DmyAVpYZB8m81OV3/uTcSNwg0+tA2YkV2CQ9rZ4vnkE=; b=wRxEGQTl0iOzcFAfGyG5fqw/MV 5fvrJzA98jP+YobvX8e/mGWmazrZ7OAZx9PBHI0PBvf7QUV79tbZ1y/i5bebxA+BD6Lxjh+hh4jpo 9bdGoFfb9FmbJfvqkB5kUam5m; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60386 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 1kvSH1-0029HC-VE for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 054/203] Split out eval_binop_assign_modify Date: Fri, 1 Jan 2021 14:44:54 -0700 Message-Id: <20210101214723.1784144-55-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: 1kvSH1-0029HC-VE X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60386 X-Source-Auth: tom+tromey.com X-Email-Count: 55 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 BINOP_ASSIGN_MODIFY into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_binop_assign_modify): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 ++++ gdb/eval.c | 65 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index c27d80ba823..b0d2a217ee5 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2028,6 +2028,42 @@ eval_op_type (struct type *expect_type, struct expression *exp, error (_("Attempt to use a type name as an expression")); } +/* A helper function for BINOP_ASSIGN_MODIFY. */ + +static struct value * +eval_binop_assign_modify (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + return arg1; + if (binop_user_defined_p (op, arg1, arg2)) + return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); + else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn, + value_type (arg1)) + && is_integral_type (value_type (arg2))) + arg2 = value_ptradd (arg1, value_as_long (arg2)); + else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn, + value_type (arg1)) + && is_integral_type (value_type (arg2))) + arg2 = value_ptradd (arg1, - value_as_long (arg2)); + else + { + struct value *tmp = arg1; + + /* For shift and integer exponentiation operations, + only promote the first argument. */ + if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP) + && is_integral_type (value_type (arg2))) + unop_promote (exp->language_defn, exp->gdbarch, &tmp); + else + binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); + + arg2 = value_binop (tmp, arg2, op); + } + return value_assign (arg1, arg2); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2681,34 +2717,9 @@ evaluate_subexp_standard (struct type *expect_type, (*pos) += 2; arg1 = evaluate_subexp (nullptr, exp, pos, noside); arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; op = exp->elts[pc + 1].opcode; - if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); - else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn, - value_type (arg1)) - && is_integral_type (value_type (arg2))) - arg2 = value_ptradd (arg1, value_as_long (arg2)); - else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn, - value_type (arg1)) - && is_integral_type (value_type (arg2))) - arg2 = value_ptradd (arg1, - value_as_long (arg2)); - else - { - struct value *tmp = arg1; - - /* For shift and integer exponentiation operations, - only promote the first argument. */ - if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP) - && is_integral_type (value_type (arg2))) - unop_promote (exp->language_defn, exp->gdbarch, &tmp); - else - binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2); - - arg2 = value_binop (tmp, arg2, op); - } - return value_assign (arg1, arg2); + return eval_binop_assign_modify (expect_type, exp, noside, op, + arg1, arg2); case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); -- 2.26.2