From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677583770; x=1709119770; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=tIA1ysESdEwnLPzbj6vv26fDzHEVzunse/4UhKJMKLE=; b=D6tvjT1U/ulR2fv4QNsms0c03vTeczU6crq2TCWXn/EliKhFqBaO3y5L TseCa4BX99C7ObkCs2o7eQxGJ4YQgOKNN02wEBhkkNS0Y9zb7qhXsqeOw bJsIiq8mTL8msZ/9QEUJyq797V0pYs4VYUO688zKUPXsaOtWNI+Uk73YR smZv8B/jjgSR0NicqTdJ367uBfBjA96EUkmc/z0MKaf2zoWeRfIHD9ICL QLvZrsEJWzZeBOutQOzF4ug83WST/Db2b8FP6YvrAjlexk1H/OlQiPtbw Iah8fVR3bNTOi29dBsAscVsAqblQgtzAYngYcaOwpvP+3jW2aHIC3FcLZ Q==; 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 From: Tankut Baris Aktemur 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 List-Id: 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 { -- 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928