From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id B14ED3858C5E for ; Tue, 20 Jun 2023 17:36:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B14ED3858C5E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 1797F10047407 for ; Tue, 20 Jun 2023 17:36:40 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id BfHUq7XrSLmMcBfHUq4gCD; Tue, 20 Jun 2023 17:36:40 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=GtGHRm5C c=1 sm=1 tr=0 ts=6491e3a8 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=of4jigFt-DYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=PccncNkD7tpGo7ohE3gA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=gr0CZPkumBbQRYYKWBZagSppjimy0sLV9Y2p3q7+L6s=; b=G3AVTE0x7Kf17G1oxWxzuo/0H6 X7hrP2CGeBUsjXlahgRIMNMPhmrAuAWtlbH9GSGpHHGVdTLmtFMzkUkOH4EEIHxWnbivG8MVgoGRS P7WAXuiF7GqkAyd6apvidSlMw; Received: from 75-166-136-83.hlrn.qwest.net ([75.166.136.83]:54256 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qBfHT-001PQG-TZ for gdb-patches@sourceware.org; Tue, 20 Jun 2023 11:36:39 -0600 From: Tom Tromey Date: Tue, 20 Jun 2023 11:36:42 -0600 Subject: [PATCH v2 6/8] Make aop_map 'static' MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230619-ax-new-v2-6-47638d750dd7@tromey.com> References: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> In-Reply-To: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 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: 75.166.136.83 X-Source-L: No X-Exim-ID: 1qBfHT-001PQG-TZ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-136-83.hlrn.qwest.net ([192.168.0.21]) [75.166.136.83]:54256 X-Source-Auth: tom+tromey.com X-Email-Count: 15 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This changes aop_map to be 'static'. --- gdb/ax-general.c | 31 ++++++++++++++++++++++++++++++- gdb/ax.h | 30 ------------------------------ 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/gdb/ax-general.c b/gdb/ax-general.c index b28c8e70e0c..a8451d71b2e 100644 --- a/gdb/ax-general.c +++ b/gdb/ax-general.c @@ -294,7 +294,36 @@ ax_string (struct agent_expr *x, const char *str, int slen) /* Functions for disassembling agent expressions, and otherwise debugging the expression compiler. */ -struct aop_map aop_map[] = +/* An entry in the opcode map. */ +struct aop_map + { + + /* The name of the opcode. Null means that this entry is not a + valid opcode --- a hole in the opcode space. */ + const char *name; + + /* All opcodes take no operands from the bytecode stream, or take + unsigned integers of various sizes. If this is a positive number + n, then the opcode is followed by an n-byte operand, which should + be printed as an unsigned integer. If this is zero, then the + opcode takes no operands from the bytecode stream. + + If we get more complicated opcodes in the future, don't add other + magic values of this; that's a crock. Add an `enum encoding' + field to this, or something like that. */ + int op_size; + + /* The size of the data operated upon, in bits, for bytecodes that + care about that (ref and const). Zero for all others. */ + int data_size; + + /* Number of stack elements consumed, and number produced. */ + int consumed, produced; + }; + +/* Map of the bytecodes, indexed by bytecode number. */ + +static struct aop_map aop_map[] = { {0, 0, 0, 0, 0} #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \ diff --git a/gdb/ax.h b/gdb/ax.h index 0e82ed9e313..1fdecb2f9e5 100644 --- a/gdb/ax.h +++ b/gdb/ax.h @@ -221,36 +221,6 @@ extern void ax_string (struct agent_expr *x, const char *str, int slen); /* Disassemble the expression EXPR, writing to F. */ extern void ax_print (struct ui_file *f, struct agent_expr * EXPR); -/* An entry in the opcode map. */ -struct aop_map - { - - /* The name of the opcode. Null means that this entry is not a - valid opcode --- a hole in the opcode space. */ - const char *name; - - /* All opcodes take no operands from the bytecode stream, or take - unsigned integers of various sizes. If this is a positive number - n, then the opcode is followed by an n-byte operand, which should - be printed as an unsigned integer. If this is zero, then the - opcode takes no operands from the bytecode stream. - - If we get more complicated opcodes in the future, don't add other - magic values of this; that's a crock. Add an `enum encoding' - field to this, or something like that. */ - int op_size; - - /* The size of the data operated upon, in bits, for bytecodes that - care about that (ref and const). Zero for all others. */ - int data_size; - - /* Number of stack elements consumed, and number produced. */ - int consumed, produced; - }; - -/* Map of the bytecodes, indexed by bytecode number. */ -extern struct aop_map aop_map[]; - /* Given an agent expression AX, analyze and update its requirements. */ extern void ax_reqs (struct agent_expr *ax); -- 2.39.2