From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id 173F8385B516 for ; Mon, 13 Feb 2023 03:15:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 173F8385B516 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 progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 8A88A10047D59 for ; Mon, 13 Feb 2023 03:15:30 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id RPJSpJ4yRjkdRRPJSpCxj5; Mon, 13 Feb 2023 03:15:30 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LPqj/La9 c=1 sm=1 tr=0 ts=63e9ab52 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=6OurO3u8ZdOR-C2U1L4A: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=I2ymxQuiRLRcGn52RkJou3OIsF34IKhqb5+DmzFg0wk=; b=cZsXLuFVvC/gLl8FKDky1Rkhch Q+QBjXZceti4noMs+lpSmoK5vW+koCFXrEVIyaATDclOe+GxGDBHh05xbOUTE6/s/wvfVnLlDWa81 hMGZqVUTThKemarIogGKlFjyL; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:37668 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 1pRPJS-001AGJ-Bb for gdb-patches@sourceware.org; Sun, 12 Feb 2023 20:15:30 -0700 From: Tom Tromey Date: Sun, 12 Feb 2023 20:15:45 -0700 Subject: [PATCH v3 29/50] Turn allocate_value_contents into a method MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230209-submit-value-fixups-2023-v3-29-45e91a20c742@tromey.com> References: <20230209-submit-value-fixups-2023-v3-0-45e91a20c742@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v3-0-45e91a20c742@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: 1pRPJS-001AGJ-Bb 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]:37668 X-Source-Auth: tom+tromey.com X-Email-Count: 59 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.4 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 List-Id: This turns the static function allocate_value_contents into a method on value. It is temporarily public, until some users are converted. set_limited_array_length is converted as well. --- gdb/value.c | 52 ++++++++++++++++++++++++---------------------------- gdb/value.h | 13 +++++++++++++ 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index d1f06174d97..1268e7c46f2 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -901,39 +901,35 @@ calculate_limited_array_length (struct type *array_type) return len; } -/* Try to limit ourselves to only fetching the limited number of - elements. However, if this limited number of elements still - puts us over max_value_size, then we still refuse it and - return failure here, which will ultimately throw an error. */ +/* See value.h. */ -static bool -set_limited_array_length (struct value *val) +bool +value::set_limited_array_length () { - ULONGEST limit = val->m_limited_length; - ULONGEST len = val->type ()->length (); + ULONGEST limit = m_limited_length; + ULONGEST len = type ()->length (); if (array_length_limiting_element_count.has_value ()) - len = calculate_limited_array_length (val->type ()); + len = calculate_limited_array_length (type ()); if (limit != 0 && len > limit) len = limit; if (len > max_value_size) return false; - val->m_limited_length = max_value_size; + m_limited_length = max_value_size; return true; } -/* Allocate the contents of VAL if it has not been allocated yet. - If CHECK_SIZE is true, then apply the usual max-value-size checks. */ +/* See value.h. */ -static void -allocate_value_contents (struct value *val, bool check_size) +void +value::allocate_contents (bool check_size) { - if (!val->m_contents) + if (!m_contents) { - struct type *enclosing_type = val->enclosing_type (); - ULONGEST len = enclosing_type->length (); + struct type *enc_type = enclosing_type (); + ULONGEST len = enc_type->length (); if (check_size) { @@ -942,16 +938,16 @@ allocate_value_contents (struct value *val, bool check_size) an element limit in effect, then we can possibly try to load only a sub-set of the array contents into GDB's memory. */ - if (val->type () == enclosing_type - && val->type ()->code () == TYPE_CODE_ARRAY + if (type () == enc_type + && type ()->code () == TYPE_CODE_ARRAY && len > max_value_size - && set_limited_array_length (val)) - len = val->m_limited_length; + && set_limited_array_length ()) + len = m_limited_length; else - check_type_length_before_alloc (enclosing_type); + check_type_length_before_alloc (enc_type); } - val->m_contents.reset ((gdb_byte *) xzalloc (len)); + m_contents.reset ((gdb_byte *) xzalloc (len)); } } @@ -963,7 +959,7 @@ value::allocate (struct type *type, bool check_size) { struct value *val = value::allocate_lazy (type); - allocate_value_contents (val, check_size); + val->allocate_contents (check_size); val->m_lazy = 0; return val; } @@ -1027,7 +1023,7 @@ value::contents_raw () { int unit_size = gdbarch_addressable_memory_unit_size (arch ()); - allocate_value_contents (this, true); + allocate_contents (true); ULONGEST length = type ()->length (); return gdb::make_array_view @@ -1037,7 +1033,7 @@ value::contents_raw () gdb::array_view value::contents_all_raw () { - allocate_value_contents (this, true); + allocate_contents (true); ULONGEST length = enclosing_type ()->length (); return gdb::make_array_view (m_contents.get (), length); @@ -1574,7 +1570,7 @@ value_copy (const value *arg) const auto &arg_view = gdb::make_array_view (arg->m_contents.get (), length); - allocate_value_contents (val, false); + val->allocate_contents (false); gdb::array_view val_contents = val->contents_all_raw ().slice (0, length); @@ -3963,7 +3959,7 @@ void value::fetch_lazy () { gdb_assert (lazy ()); - allocate_value_contents (this, true); + allocate_contents (true); /* A value is either lazy, or fully fetched. The availability/validity is only established as we try to fetch a value. */ diff --git a/gdb/value.h b/gdb/value.h index a7eed4880b4..0b49dea78e9 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -586,6 +586,19 @@ struct value /* Helper for fetch_lazy when the value is in a register. */ void fetch_lazy_register (); + + /* Try to limit ourselves to only fetching the limited number of + elements. However, if this limited number of elements still + puts us over max_value_size, then we still refuse it and + return failure here, which will ultimately throw an error. */ + bool set_limited_array_length (); + +public: /* Temporary */ + + /* Allocate the contents of this value if it has not been allocated + yet. If CHECK_SIZE is true, then apply the usual max-value-size + checks. */ + void allocate_contents (bool check_size); }; /* Returns value_type or value_enclosing_type depending on -- 2.39.1