From patchwork Tue Feb 28 11:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 65741 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 4CB4E3851ABE for ; Tue, 28 Feb 2023 11:30:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CB4E3851ABE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677583822; bh=N8xIraSJ8U6NuBJDgTxc+jEImvFkSppVXF7xQ2gE2jU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yaGHH6CZjfiXQWAsw7srsfyJ3whwVpTYrG2XESk0NLuJjq7Sdh+ptAhvoATysK3gz rFf83pmKbvbEvsKnmd0POh+qxgWSetqtWKE0H/4hSzq08Qc5wIPqBu4i8riyB4QV7n dvS8952P14vJTkeA3u+PxOWmzCff9dNSwm77RrR4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by sourceware.org (Postfix) with ESMTPS id 063FE3858C27 for ; Tue, 28 Feb 2023 11:29:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 063FE3858C27 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="396679481" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="396679481" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="919748205" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="919748205" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:29 -0800 To: gdb-patches@sourceware.org Subject: [PATCH 08/26] gdbserver: convert free_register_cache into a destructor of regcache Date: Tue, 28 Feb 2023 12:28:06 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, 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: , X-Patchwork-Original-From: Tankut Baris Aktemur via Gdb-patches From: "Aktemur, Tankut Baris" Reply-To: Tankut Baris Aktemur Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Convert the `free_register_cache` function into a destructor of the regcache struct. In one place, we completely remove the call to free the regcache object by stack-allocating the object. We also delete the copy constructor explicitly to prevent the risk of copying regcaches and then double-freeing buffers when they are destructed. --- gdbserver/gdbthread.h | 2 +- gdbserver/regcache.cc | 15 +++++---------- gdbserver/regcache.h | 9 +++++---- gdbserver/server.cc | 8 +++----- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/gdbserver/gdbthread.h b/gdbserver/gdbthread.h index 493e1dbf6cb..cfd81870af9 100644 --- a/gdbserver/gdbthread.h +++ b/gdbserver/gdbthread.h @@ -35,7 +35,7 @@ struct thread_info ~thread_info () { - free_register_cache (this->regcache_data); + delete this->regcache_data; } /* The id of this thread. */ diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index be01df342bb..7b6337166ad 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -165,16 +165,11 @@ regcache::regcache (const target_desc *tdesc) initialize (tdesc, nullptr); } -void -free_register_cache (struct regcache *regcache) +regcache::~regcache () { - if (regcache) - { - if (regcache->registers_owned) - free (regcache->registers); - free (regcache->register_status); - delete regcache; - } + if (registers_owned) + free (registers); + free (register_status); } #endif @@ -280,7 +275,7 @@ free_register_cache_thread (struct thread_info *thread) if (regcache != NULL) { regcache_invalidate_thread (thread); - free_register_cache (regcache); + delete regcache; set_thread_regcache_data (thread, NULL); } } diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 32b3a8dccfc..614d5a2561f 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -51,6 +51,11 @@ struct regcache : public reg_buffer_common /* Constructors. */ regcache () = default; regcache (const target_desc *tdesc); + regcache (const regcache &rhs) = delete; + regcache &operator= (const regcache &rhs) = delete; + + /* Deconstructor. */ + virtual ~regcache (); #endif /* Init the regcache data. */ @@ -77,10 +82,6 @@ struct regcache : public reg_buffer_common regcache *get_thread_regcache (thread_info *thread, bool fetch = true); -/* Release all memory associated with the register cache for INFERIOR. */ - -void free_register_cache (struct regcache *regcache); - /* Invalidate cached registers for one thread. */ void regcache_invalidate_thread (struct thread_info *); diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 4be12ec1c66..521f13c07d7 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -4237,15 +4237,13 @@ process_serial_event (void) require_running_or_break (cs.own_buf); if (cs.current_traceframe >= 0) { - struct regcache *regcache - = new struct regcache (current_target_desc ()); + regcache a_regcache (current_target_desc ()); if (fetch_traceframe_registers (cs.current_traceframe, - regcache, -1) == 0) - registers_to_string (regcache, cs.own_buf); + &a_regcache, -1) == 0) + registers_to_string (&a_regcache, cs.own_buf); else write_enn (cs.own_buf); - free_register_cache (regcache); } else {