From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [50.116.126.2]) by sourceware.org (Postfix) with ESMTPS id A9D32393C01D for ; Sat, 20 Feb 2021 20:16:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A9D32393C01D 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 gateway36.websitewelcome.com (Postfix) with ESMTP id 52D08400C828B for ; Sat, 20 Feb 2021 14:16:18 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYfqlKz0xoE4DDYfqlHSap; Sat, 20 Feb 2021 14:16:18 -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=DZ6yiH1JViU5zZVahsGGx1+rGf/g5x0HPUX9U/YjUOc=; b=mrGsvN/6DNn6++YOHTX1pt8mhA 8sWP8h3Q3vytv8QE+XaGRMiQcEL0ZwsLPewxm/h69RiL9iiT5aumz4TKfB1Y3WpT7+ZRB8cpp0lJ5 a/YZS+j86oujmB2M6lBqASXtn; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52676 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 1lDYfq-000GEQ-2O for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:18 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 023/206] Split out eval_op_repeat Date: Sat, 20 Feb 2021 13:13:06 -0700 Message-Id: <20210220201609.838264-24-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYfq-000GEQ-2O X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52676 X-Source-Auth: tom+tromey.com X-Email-Count: 24 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, 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: Sat, 20 Feb 2021 20:16:19 -0000 This splits BINOP_REPEAT into a new function for future use. gdb/ChangeLog 2021-02-20 Tom Tromey * eval.c (eval_op_repeat): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 36 +++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index e2f1098f9ed..d08722c2072 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1729,6 +1729,28 @@ eval_op_leq (struct type *expect_type, struct expression *exp, } } +/* A helper function for BINOP_REPEAT. */ + +static struct value * +eval_op_repeat (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + struct type *type = check_typedef (value_type (arg2)); + if (type->code () != TYPE_CODE_INT + && type->code () != TYPE_CODE_ENUM) + error (_("Non-integral right operand for \"@\" operator.")); + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + return allocate_repeat_value (value_type (arg1), + longest_to_int (value_as_long (arg2))); + } + else + return value_repeat (arg1, longest_to_int (value_as_long (arg2))); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2570,19 +2592,7 @@ evaluate_subexp_standard (struct type *expect_type, case BINOP_REPEAT: arg1 = evaluate_subexp (nullptr, exp, pos, noside); arg2 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - type = check_typedef (value_type (arg2)); - if (type->code () != TYPE_CODE_INT - && type->code () != TYPE_CODE_ENUM) - error (_("Non-integral right operand for \"@\" operator.")); - if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - return allocate_repeat_value (value_type (arg1), - longest_to_int (value_as_long (arg2))); - } - else - return value_repeat (arg1, longest_to_int (value_as_long (arg2))); + return eval_op_repeat (expect_type, exp, noside, arg1, arg2); case BINOP_COMMA: evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2