From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OFFCG5WY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:05 -0500 Received: by simark.ca (Postfix, from userid 112) id 014B51F0B8; Fri, 1 Jan 2021 16:48:04 -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 6B6421F0B8 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 6B0DF3844040; 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 D0789388E823 for ; Fri, 1 Jan 2021 21:47:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D0789388E823 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 7AC9D2C1E6 for ; Fri, 1 Jan 2021 15:47:49 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGzk10hBiQiZvSGzki7st; 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=d/mSnkPrmjnkpJ20O92cyUQuAnLVCKo51V1nmWGVRww=; b=M9ZIHZjD5ijIOkm0lo7IZ7vPvm d1C2DwmaGXP7gICgxBE60GhCKx4n1MkRusR3GXwBB+82oI3U9DdsAzVbqIulHmn50pc6920Uv3TpR UMVTamFF2OdtIErRQKFwn2xW8; 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-AB for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 053/203] Split out eval_op_m2_subscript Date: Fri, 1 Jan 2021 14:44:53 -0700 Message-Id: <20210101214723.1784144-54-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-AB 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: 54 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_SUBSCRIPT into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * m2-lang.c (eval_op_m2_subscript): New function. (evaluate_subexp_modula2): Use it. --- gdb/ChangeLog | 5 +++ gdb/m2-lang.c | 99 ++++++++++++++++++++++++++------------------------- 2 files changed, 56 insertions(+), 48 deletions(-) diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 982bc264a3b..f5e80eee9c6 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -60,6 +60,56 @@ eval_op_m2_high (struct type *expect_type, struct expression *exp, return arg1; } +/* A helper function for BINOP_SUBSCRIPT. */ + +static struct value * +eval_op_m2_subscript (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); + /* If the user attempts to subscript something that is not an + array or pointer type (like a plain int variable for example), + then report this as an error. */ + + 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 (0).type (); + if (type == NULL || (type->code () != TYPE_CODE_PTR)) + error (_("internal error: unbounded " + "array structure is unknown")); + /* i18n: Do not translate the "_m2_contents" part! */ + arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL, + _("unbounded structure " + "missing _m2_contents field")); + + if (value_type (arg1) != type) + arg1 = value_cast (type, arg1); + + check_typedef (value_type (arg1)); + return value_ind (value_ptradd (arg1, value_as_long (arg2))); + } + else + if (type->code () != TYPE_CODE_ARRAY) + { + if (type->name ()) + error (_("cannot subscript something of type `%s'"), + type->name ()); + else + error (_("cannot subscript requested type")); + } + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (TYPE_TARGET_TYPE (type), VALUE_LVAL (arg1)); + else + return value_subscript (arg1, value_as_long (arg2)); +} + static struct value * evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, int *pos, enum noside noside) @@ -67,7 +117,6 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, enum exp_opcode op = exp->elts[*pos].opcode; struct value *arg1; struct value *arg2; - struct type *type; switch (op) { @@ -80,57 +129,11 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, (*pos)++; arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); - if (noside == EVAL_SKIP) - goto nosideret; - /* If the user attempts to subscript something that is not an - array or pointer type (like a plain int variable for example), - then report this as an error. */ - - arg1 = coerce_ref (arg1); - type = check_typedef (value_type (arg1)); - - if (m2_is_unbounded_array (type)) - { - struct value *temp = arg1; - type = type->field (0).type (); - if (type == NULL || (type->code () != TYPE_CODE_PTR)) - { - warning (_("internal error: unbounded " - "array structure is unknown")); - return evaluate_subexp_standard (expect_type, exp, pos, noside); - } - /* i18n: Do not translate the "_m2_contents" part! */ - arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL, - _("unbounded structure " - "missing _m2_contents field")); - - if (value_type (arg1) != type) - arg1 = value_cast (type, arg1); - - check_typedef (value_type (arg1)); - return value_ind (value_ptradd (arg1, value_as_long (arg2))); - } - else - if (type->code () != TYPE_CODE_ARRAY) - { - if (type->name ()) - error (_("cannot subscript something of type `%s'"), - type->name ()); - else - error (_("cannot subscript requested type")); - } - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (TYPE_TARGET_TYPE (type), VALUE_LVAL (arg1)); - else - return value_subscript (arg1, value_as_long (arg2)); + return eval_op_m2_subscript (expect_type, exp, noside, arg1, arg2); default: return evaluate_subexp_standard (expect_type, exp, pos, noside); } - - nosideret: - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1); } -- 2.26.2