From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AA3jAJWY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:05 -0500 Received: by simark.ca (Postfix, from userid 112) id C24A91F071; Fri, 1 Jan 2021 16:48:03 -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 E22E91F0AA for ; Fri, 1 Jan 2021 16:48:01 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22536388E835; Fri, 1 Jan 2021 21:47:54 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id A8BBD388E81D for ; Fri, 1 Jan 2021 21:47:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A8BBD388E81D 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 53BC82C1F1 for ; Fri, 1 Jan 2021 15:47:49 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGzk10h5iQiZvSGzki7sm; Fri, 01 Jan 2021 15:47:49 -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=7vVPvvwfBczO0RfjAAAiQwUe+VQX+gJg6Wz9oYGDhn0=; b=tbMv9/AeFipgfQFvQE6UY0bTZ2 n1/D9LBGfq8rzMumKXtmAmRDCXzPECXDiMGCLh3XLK0XnJ+JrtgZpai8wmUh5SOwi2EdML/xOWMNs 8eIWQrnxBW03KiHQlGgaa2FpK; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60384 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 1kvSGz-0029E8-4Y for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 052/203] Split out eval_op_m2_high Date: Fri, 1 Jan 2021 14:44:52 -0700 Message-Id: <20210101214723.1784144-53-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: 1kvSGz-0029E8-4Y X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60384 X-Source-Auth: tom+tromey.com X-Email-Count: 53 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_HIGH into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * m2-lang.c (eval_op_m2_high): New function. (evaluate_subexp_modula2): Use it. --- gdb/ChangeLog | 5 +++++ gdb/m2-lang.c | 55 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index fb49ba470d6..982bc264a3b 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -29,6 +29,37 @@ #include "valprint.h" #include "gdbarch.h" +/* A helper function for UNOP_HIGH. */ + +static struct value * +eval_op_m2_high (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1) +{ + if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + return arg1; + else + { + arg1 = coerce_ref (arg1); + struct type *type = check_typedef (value_type (arg1)); + + if (m2_is_unbounded_array (type)) + { + struct value *temp = arg1; + + type = type->field (1).type (); + /* i18n: Do not translate the "_m2_high" part! */ + arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL, + _("unbounded structure " + "missing _m2_high field")); + + if (value_type (arg1) != type) + arg1 = value_cast (type, arg1); + } + } + return arg1; +} + static struct value * evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, int *pos, enum noside noside) @@ -43,29 +74,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, case UNOP_HIGH: (*pos)++; arg1 = evaluate_subexp_with_coercion (exp, pos, noside); - - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; - else - { - arg1 = coerce_ref (arg1); - type = check_typedef (value_type (arg1)); - - if (m2_is_unbounded_array (type)) - { - struct value *temp = arg1; - - type = type->field (1).type (); - /* i18n: Do not translate the "_m2_high" part! */ - arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL, - _("unbounded structure " - "missing _m2_high field")); - - if (value_type (arg1) != type) - arg1 = value_cast (type, arg1); - } - } - return arg1; + return eval_op_m2_high (expect_type, exp, noside, arg1); case BINOP_SUBSCRIPT: (*pos)++; -- 2.26.2