From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id aEQiHdfl/WNbeAAAWB0awg (envelope-from ) for ; Tue, 28 Feb 2023 06:30:31 -0500 Received: by simark.ca (Postfix, from userid 112) id 74FFE1E222; Tue, 28 Feb 2023 06:30:31 -0500 (EST) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=XmdjIsRd; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 1BA721E128 for ; Tue, 28 Feb 2023 06:30:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C3C273850208 for ; Tue, 28 Feb 2023 11:30:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3C273850208 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677583830; bh=8/H0/5PIp1rZMtwfHVvwkqOKQmq3JP1hGlKv+SDU968=; 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=XmdjIsRdMQzXL16d+UBUc7aRunAbmb1CjzG7WoRE/NcAlD56vTZPpqfSd/fN9ffFA ukrnXjSf/tGBk2qlfJMlSX8SSafr5r34Qz6TUQRvyuAoPxhMmsTB9VLouAfCbKW+Yj 5WzdFfpcV8Mhp+UnFwV2ryiknY2YsaQnXTY2/4eM= Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by sourceware.org (Postfix) with ESMTPS id BC6503858004 for ; Tue, 28 Feb 2023 11:29:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC6503858004 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="314536354" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="314536354" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:17 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="738120528" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="738120528" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:16 -0800 To: gdb-patches@sourceware.org Subject: [PATCH 06/26] gdbserver: turn part of get_thread_regcache into regcache::fetch Date: Tue, 28 Feb 2023 12:28:04 +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-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: , From: Tankut Baris Aktemur via Gdb-patches Reply-To: Tankut Baris Aktemur Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Extract out a piece of code in get_thread_regcache that fetches the registers from the target, and turn it into a method of 'regcache'. --- gdbserver/regcache.cc | 23 +++++++++++++++-------- gdbserver/regcache.h | 3 +++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 2a8dc17ed6a..89ecdfec6f3 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -48,19 +48,26 @@ get_thread_regcache (struct thread_info *thread, bool fetch) regcache->thread = thread; } - if (fetch && regcache->registers_valid == 0) + if (fetch) + regcache->fetch (); + + return regcache; +} + +void +regcache::fetch () +{ + if (registers_valid == 0) { scoped_restore_current_thread restore_thread; + gdb_assert (this->thread != nullptr); + switch_to_thread (this->thread); - switch_to_thread (thread); /* Invalidate all registers, to prevent stale left-overs. */ - memset (regcache->register_status, REG_UNAVAILABLE, - regcache->tdesc->reg_defs.size ()); - fetch_inferior_registers (regcache, -1); - regcache->registers_valid = 1; + memset (register_status, REG_UNAVAILABLE, tdesc->reg_defs.size ()); + fetch_inferior_registers (this, -1); + registers_valid = 1; } - - return regcache; } /* See gdbsupport/common-regcache.h. */ diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 053ed08b20f..7eae6cb724a 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -67,6 +67,9 @@ struct regcache : public reg_buffer_common /* See gdbsupport/common-regcache.h. */ bool raw_compare (int regnum, const void *buf, int offset) const override; + + /* Fetch the registers from the target, if not done already. */ + void fetch (); }; void regcache_cpy (struct regcache *dst, struct regcache *src); -- 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