From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eIt2HJw0YWfkLB4AWB0awg (envelope-from ) for ; Tue, 17 Dec 2024 03:21:48 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=HTN3f3r5; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 715EC1E097; Tue, 17 Dec 2024 03:21:48 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=4.0.0 Received: from server2.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 ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 0D5CE1E05C for ; Tue, 17 Dec 2024 03:21:48 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92C153858C39 for ; Tue, 17 Dec 2024 08:21:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92C153858C39 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=HTN3f3r5 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by sourceware.org (Postfix) with ESMTPS id 6E8073858D28 for ; Tue, 17 Dec 2024 08:19:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E8073858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6E8073858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734423543; cv=none; b=IVS//Pl27zAaI8mZM4WchxQUTQO5SJ4V0hWZggVt0Sbw7fB1EoRWlHpQUVHzhY/rOBVrYuVcfQS9MSrsjlJzBTL9bNA8gZ8eah8IYW9enude8U7B5G7QjKyMMvn9PMopmuswcO+TBKOLOxdUMHjp694ew05BVeQXGPsRBldhq/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734423543; c=relaxed/simple; bh=JDoaQX8QfxHgTqL9FLl0O16xi8ALDkX2QdAJva4aH8M=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ikFXBbgLf3QrMLGOJwe2SzdonnWo37K6p/afeYkvtJF6u7CQ7NB6dPfvvkFEbAgJq3ynuXKUZ9FvQOqSueMqj88k2wmYW6IFO7P+CkKBE0NxeCJi1If1HeuessC8GBGxIP7ys2Nydco2nEBSunV4KkuhA6ZzyYnWEXkzXc8UBGE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E8073858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1734423544; x=1765959544; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JDoaQX8QfxHgTqL9FLl0O16xi8ALDkX2QdAJva4aH8M=; b=HTN3f3r5qsj78H2+OD4OBD3x4SXimpd9aP3uBIGFLKhHrTXBAjs/nWxU Anv57GPVDeSCF9htGr7wj0+hM8+wimFyvOD63k9Qli/6ggoUdf3IHRMEx oMplFz1AjKATA1xspQkmNW7dti92BpOnOVJduz0Qi2guZNQj0EQZkQhRK HimeHwEVl642/29CUnH2g8YF4mmw0CRAcvx4BpFMNCOcKQaK8xy/yrG24 EXb+LzZxKs+17GCq3PiqA2eB9rrIRJCNLp2ehEMwdmnQYWJLUlUzxchof vsdSK+Vv0nKBdiOh9RZX6nCVQm2NyF44o4LxFpB6yL12GJBdu1W/oRggd Q==; X-CSE-ConnectionGUID: dEVVKhYxS6eA1T7XMHtLtA== X-CSE-MsgGUID: 15bprB9URv+r+VWfM2z1kA== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="22427830" X-IronPort-AV: E=Sophos;i="6.12,241,1728975600"; d="scan'208";a="22427830" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 00:19:03 -0800 X-CSE-ConnectionGUID: xXDtBHUaRzesXD4FWfR3qg== X-CSE-MsgGUID: 94NHZgdmRq+pHL/L1rRb5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,241,1728975600"; d="scan'208";a="97346358" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 00:19:02 -0800 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: simon.marchi@efficios.com Subject: [PUSHED 3/8] gdbserver: convert regcache_cpy into regcache::copy_from Date: Tue, 17 Dec 2024 09:18:25 +0100 Message-Id: X-Mailer: git-send-email 2.34.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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Convert the free `regcache_cpy` function to a method of the regcache struct. Approved-By: Simon Marchi --- gdbserver/regcache.cc | 16 ++++++++-------- gdbserver/regcache.h | 5 +++-- gdbserver/tracepoint.cc | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 5ae922ec0be..583b5624333 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -178,19 +178,19 @@ free_register_cache (struct regcache *regcache) #endif void -regcache_cpy (struct regcache *dst, struct regcache *src) +regcache::copy_from (regcache *src) { - gdb_assert (src != NULL && dst != NULL); - gdb_assert (src->tdesc == dst->tdesc); - gdb_assert (src != dst); + gdb_assert (src != nullptr); + gdb_assert (src->tdesc == this->tdesc); + gdb_assert (src != this); - memcpy (dst->registers, src->registers, src->tdesc->registers_size); + memcpy (this->registers, src->registers, src->tdesc->registers_size); #ifndef IN_PROCESS_AGENT - if (dst->register_status != NULL && src->register_status != NULL) - memcpy (dst->register_status, src->register_status, + if (this->register_status != nullptr && src->register_status != nullptr) + memcpy (this->register_status, src->register_status, src->tdesc->reg_defs.size ()); #endif - dst->registers_valid = src->registers_valid; + this->registers_valid = src->registers_valid; } /* Return a reference to the description of register N. */ diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 068f9e8df3d..db3b2425de6 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -60,14 +60,15 @@ struct regcache : public reg_buffer_common /* See gdbsupport/common-regcache.h. */ bool raw_compare (int regnum, const void *buf, int offset) const override; + + /* Copy the contents of SRC into this regcache. */ + void copy_from (regcache *src); }; struct regcache *init_register_cache (struct regcache *regcache, const struct target_desc *tdesc, unsigned char *regbuf); -void regcache_cpy (struct regcache *dst, struct regcache *src); - /* Create a new register cache for INFERIOR. */ struct regcache *new_register_cache (const struct target_desc *tdesc); diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index 6b5541b5fbf..81104b02c83 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -4797,7 +4797,7 @@ do_action_at_tracepoint (struct tracepoint_hit_ctx *ctx, regspace + 1); /* Copy the register data to the regblock. */ - regcache_cpy (&tregcache, context_regcache); + tregcache.copy_from (context_regcache); #ifndef IN_PROCESS_AGENT /* On some platforms, trap-based tracepoints will have the PC -- 2.34.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928