From patchwork Thu Feb 9 21:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64556 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 428513881D15 for ; Thu, 9 Feb 2023 21:38:59 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 6377D3858C74 for ; Thu, 9 Feb 2023 21:38:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6377D3858C74 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id AEC7310040616 for ; Thu, 9 Feb 2023 21:38:40 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QEcqphyBW2s14QEcqphhlb; Thu, 09 Feb 2023 21:38:40 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=R7DGpfdX c=1 sm=1 tr=0 ts=63e567e0 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=Th0pbswXEgJDPzUh0wYA: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=7SsVdZEt5uXdXgRSA7/VbHkFh1O/LYcV58tnJb/i5Q0=; b=qJkW+9RDYg4TZZehYvphIbcsXI FaWQcGlVKBIItD6iFB9v/CJspBjvk9z0pbrvPXs7kAdcOaCygy9T4A4H+Pfrvz9aLNPyLk7rOcN63 k/21zRanPIu3HSLqM09Uv36IW; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:52822 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 1pQEcq-001ZcE-F5 for gdb-patches@sourceware.org; Thu, 09 Feb 2023 14:38:40 -0700 From: Tom Tromey Date: Thu, 09 Feb 2023 14:38:27 -0700 Subject: [PATCH 06/47] Turn value_arch into method MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v1-6-55dc2794dbb9@tromey.com> References: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.0 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.130.93 X-Source-L: No X-Exim-ID: 1pQEcq-001ZcE-F5 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:52822 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes value_arch to be a method of value. Much of this patch was written by script. --- gdb/valops.c | 2 +- gdb/value.c | 12 ++++++------ gdb/value.h | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gdb/valops.c b/gdb/valops.c index 1cac2496183..2d1db3cef83 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1045,7 +1045,7 @@ read_value_memory (struct value *val, LONGEST bit_offset, gdb_byte *buffer, size_t length) { ULONGEST xfered_total = 0; - struct gdbarch *arch = get_value_arch (val); + struct gdbarch *arch = val->get_arch (); int unit_size = gdbarch_addressable_memory_unit_size (arch); enum target_object object; diff --git a/gdb/value.c b/gdb/value.c index bde8f3da4d2..96db14c99cc 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -163,9 +163,9 @@ value::~value () /* See value.h. */ struct gdbarch * -get_value_arch (const struct value *value) +value::get_arch () const { - return value->type ()->arch (); + return type ()->arch (); } int @@ -944,7 +944,7 @@ set_value_parent (struct value *value, struct value *parent) gdb::array_view value_contents_raw (struct value *value) { - struct gdbarch *arch = get_value_arch (value); + struct gdbarch *arch = value->get_arch (); int unit_size = gdbarch_addressable_memory_unit_size (arch); allocate_value_contents (value); @@ -1121,7 +1121,7 @@ value_contents_copy_raw (struct value *dst, LONGEST dst_offset, struct value *src, LONGEST src_offset, LONGEST length) { LONGEST src_bit_offset, dst_bit_offset, bit_length; - struct gdbarch *arch = get_value_arch (src); + struct gdbarch *arch = src->get_arch (); int unit_size = gdbarch_addressable_memory_unit_size (arch); /* A lazy DST would make that this copy operation useless, since as @@ -2160,7 +2160,7 @@ set_internalvar_component (struct internalvar *var, { case INTERNALVAR_VALUE: addr = value_contents_writeable (var->u.value).data (); - arch = get_value_arch (var->u.value); + arch = var->u.value->get_arch (); unit_size = gdbarch_addressable_memory_unit_size (arch); if (bitsize) @@ -2884,7 +2884,7 @@ value_primitive_field (struct value *arg1, LONGEST offset, { struct value *v; struct type *type; - struct gdbarch *arch = get_value_arch (arg1); + struct gdbarch *arch = arg1->get_arch (); int unit_size = gdbarch_addressable_memory_unit_size (arch); arg_type = check_typedef (arg_type); diff --git a/gdb/value.h b/gdb/value.h index cb92b872bc6..31ec0b5c202 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -169,6 +169,9 @@ struct value void deprecated_set_type (struct type *type) { m_type = type; } + /* Return the gdbarch associated with the value. */ + struct gdbarch *get_arch () const; + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -336,10 +339,6 @@ struct value std::vector m_optimized_out; }; -/* Return the gdbarch associated with the value. */ - -extern struct gdbarch *get_value_arch (const struct value *value); - /* Only used for bitfields; number of bits contained in them. */ extern LONGEST value_bitsize (const struct value *);