From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wPbPN7aY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:38 -0500 Received: by simark.ca (Postfix, from userid 112) id 8C9E91F0B7; Fri, 1 Jan 2021 16:48:37 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,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 B4AA01F0BA for ; Fri, 1 Jan 2021 16:48:36 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E49F3844060; Fri, 1 Jan 2021 21:48:17 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id E38363893663 for ; Fri, 1 Jan 2021 21:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E38363893663 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 gateway33.websitewelcome.com (Postfix) with ESMTP id 8F44CEEF2CA for ; Fri, 1 Jan 2021 15:48:14 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHOkZEneoE4DvSHOkuHD1; Fri, 01 Jan 2021 15:48:14 -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=ZmFges5znxhecXWakyPwIfRYUCgAEBaJU6wboW9Q+8U=; b=wp+8IR0UaDHJSHRY+8cXlut7mC xc89/RvJlxO9krtLGAQtP84VNLDxpELfXr1feUKuqCSY68IwNNYyD5Hfl1u4NdEKlzE9R4nfihQxq xmJ50t0AkHe2lUps0LD4sNHmG; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60400 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 1kvSHO-0029XH-CM for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:14 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 102/203] Introduce repeat_operation Date: Fri, 1 Jan 2021 14:45:42 -0700 Message-Id: <20210101214723.1784144-103-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: 1kvSHO-0029XH-CM X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60400 X-Source-Auth: tom+tromey.com X-Email-Count: 103 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 adds class repeat_operation, which implements BINOP_REPEAT. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class repeat_operation): New. * eval.c (eval_op_repeat): No longer static. Remove "op" parameter. (evaluate_subexp_standard): Update. * ax-gdb.c (repeat_operation::do_generate_ax): New method. --- gdb/ChangeLog | 8 ++++++++ gdb/ax-gdb.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/eval.c | 6 +++--- gdb/expop.h | 20 ++++++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 87aa2107872..332840456fe 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2419,6 +2419,56 @@ ternop_cond_operation::do_generate_ax (struct expression *exp, value->kind = value2.kind; } +/* Generate code for GDB's magical `repeat' operator. + LVALUE @ INT creates an array INT elements long, and whose elements + have the same type as LVALUE, located in memory so that LVALUE is + its first element. For example, argv[0]@argc gives you the array + of command-line arguments. + + Unfortunately, because we have to know the types before we actually + have a value for the expression, we can't implement this perfectly + without changing the type system, having values that occupy two + stack slots, doing weird things with sizeof, etc. So we require + the right operand to be a constant expression. */ +void +repeat_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + struct axs_value value1; + + /* We don't want to turn this into an rvalue, so no conversions + here. */ + std::get<0> (m_storage)->generate_ax (exp, ax, &value1); + if (value1.kind != axs_lvalue_memory) + error (_("Left operand of `@' must be an object in memory.")); + + /* Evaluate the length; it had better be a constant. */ + if (!std::get<1> (m_storage)->constant_p ()) + error (_("Right operand of `@' must be a " + "constant, in agent expressions.")); + + struct value *v + = std::get<1> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + if (value_type (v)->code () != TYPE_CODE_INT) + error (_("Right operand of `@' must be an integer.")); + int length = value_as_long (v); + if (length <= 0) + error (_("Right operand of `@' must be positive.")); + + /* The top of the stack is already the address of the object, so + all we need to do is frob the type of the lvalue. */ + /* FIXME-type-allocation: need a way to free this type when we are + done with it. */ + struct type *array + = lookup_array_range_type (value1.type, 0, length - 1); + + value->kind = axs_lvalue_memory; + value->type = array; +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/eval.c b/gdb/eval.c index e9c4a1fffd0..06f4c67e1d7 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1717,9 +1717,9 @@ eval_op_leq (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_REPEAT. */ -static struct value * +struct value * eval_op_repeat (struct type *expect_type, struct expression *exp, - enum noside noside, + enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { if (noside == EVAL_SKIP) @@ -2921,7 +2921,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); - return eval_op_repeat (expect_type, exp, noside, arg1, arg2); + return eval_op_repeat (expect_type, exp, noside, op, arg1, arg2); case BINOP_COMMA: evaluate_subexp (nullptr, exp, pos, noside); diff --git a/gdb/expop.h b/gdb/expop.h index 27264562a4e..419ce05abaf 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -134,6 +134,11 @@ extern struct value *eval_op_leq (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2); +extern struct value *eval_op_repeat (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); namespace expr { @@ -1177,6 +1182,21 @@ using gtr_operation = comparison_operation; using geq_operation = comparison_operation; using leq_operation = comparison_operation; +/* Implement the GDB '@' repeat operator. */ +class repeat_operation + : public binop_operation +{ + using binop_operation::binop_operation; + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override; +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2