From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2HWKBH2Y71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:41 -0500 Received: by simark.ca (Postfix, from userid 112) id ED9AA1F0B8; Fri, 1 Jan 2021 16:47:40 -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 8580C1F0BA for ; Fri, 1 Jan 2021 16:47:38 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A439B386F016; Fri, 1 Jan 2021 21:47:36 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id BA463386EC52 for ; Fri, 1 Jan 2021 21:47:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BA463386EC52 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 646A3298F2 for ; Fri, 1 Jan 2021 15:47:32 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGik10XsiQiZvSGiki7jX; Fri, 01 Jan 2021 15:47:32 -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=ZH0dZ8zyGqa+3llZu9UaQaewcVlmh4v+9QpmI58cRFE=; b=hMIiZDWjYGj8wZ/O9p/jJ7Nixd 8BcLA/cld/ZRiSTqS6ZLdW0mXFgMRRydKXVhFJxpKWsijFzozi5YD4Etv1DsOEX53dWbk/rLbRso5 nctsUhK1HgCA7y9j6/ZbNeqzY; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60374 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 1kvSGi-00292J-5a for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:32 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 015/203] Split out eval_op_sub Date: Fri, 1 Jan 2021 14:44:15 -0700 Message-Id: <20210101214723.1784144-16-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: 1kvSGi-00292J-5a X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60374 X-Source-Auth: tom+tromey.com X-Email-Count: 16 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_SUB into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_sub): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 48 +++++++++++++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index f6d92dd9824..a94f61b0cec 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1465,6 +1465,34 @@ eval_op_add (struct type *expect_type, struct expression *exp, } } +/* A helper function for BINOP_SUB. */ + +static struct value * +eval_op_sub (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + if (binop_user_defined_p (op, arg1, arg2)) + return value_x_binop (arg1, arg2, op, OP_NULL, noside); + else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) + && ptrmath_type_p (exp->language_defn, value_type (arg2))) + { + /* FIXME -- should be ptrdiff_t */ + struct type *type = builtin_type (exp->gdbarch)->builtin_long; + return value_from_longest (type, value_ptrdiff (arg1, arg2)); + } + else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) + && is_integral_or_integral_reference (value_type (arg2))) + return value_ptradd (arg1, - value_as_long (arg2)); + else + { + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + return value_binop (arg1, arg2, BINOP_SUB); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2156,25 +2184,7 @@ evaluate_subexp_standard (struct type *expect_type, case BINOP_SUB: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, op, OP_NULL, noside); - else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) - && ptrmath_type_p (exp->language_defn, value_type (arg2))) - { - /* FIXME -- should be ptrdiff_t */ - type = builtin_type (exp->gdbarch)->builtin_long; - return value_from_longest (type, value_ptrdiff (arg1, arg2)); - } - else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) - && is_integral_or_integral_reference (value_type (arg2))) - return value_ptradd (arg1, - value_as_long (arg2)); - else - { - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - return value_binop (arg1, arg2, BINOP_SUB); - } + return eval_op_sub (expect_type, exp, noside, op, arg1, arg2); case BINOP_EXP: case BINOP_MUL: -- 2.26.2