From patchwork Fri Dec 2 19:47:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61394 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 061F43858407 for ; Fri, 2 Dec 2022 19:47:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 061F43858407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670010465; bh=Y+52VDEwHgJs3klP2ep6+vUtZHIx/YRVfc1U1MDrV7M=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Q+WiGfqjoIsiPnqk9MxHH6pwYDsE5zBX1wzo3NP0ONrGpY2o5mAFo2y/KgfOiyUAF 7rIZ5fgXPATQZwa7V/V908b2ltdOewLJPkOMCMoG9xPlmNYblDTTrhk80YlDgyxaJz UoM3O0SS7Rqq5tE7bZ7NCtIwvxreFc3t/iLZ+Bsk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 01EB83858C62 for ; Fri, 2 Dec 2022 19:47:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 01EB83858C62 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2JlGel001998 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 14:47:21 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2JlGel001998 Received: from simark.localdomain (unknown [217.28.27.60]) (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 ESMTPSA id 29C631E112; Fri, 2 Dec 2022 14:47:16 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gdb/linux-nat: add pid parameter to linux_proc_xfer_memory_partial Date: Fri, 2 Dec 2022 14:47:15 -0500 Message-Id: <20221202194715.234224-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 19:47:16 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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 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: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Add a pid parameter to linux_proc_xfer_memory_partial, making the inferior_ptid reference bubble up close to the target_ops::xfer_partial boundary. No behavior change expected. Change-Id: I58171b00ee1bba1ea22efdbb5dcab8b1ab3aac4c --- gdb/linux-nat.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) base-commit: f8baaa2b0bfe410f41cf1ca5c87ae78ca59587e5 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 0b3c143382ba..17e5dce08c3d 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -3667,8 +3667,9 @@ linux_nat_xfer_osdata (enum target_object object, ULONGEST *xfered_len); static enum target_xfer_status -linux_proc_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, - ULONGEST offset, LONGEST len, ULONGEST *xfered_len); +linux_proc_xfer_memory_partial (int pid, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST offset, + LONGEST len, ULONGEST *xfered_len); enum target_xfer_status linux_nat_target::xfer_partial (enum target_object object, @@ -3713,8 +3714,9 @@ linux_nat_target::xfer_partial (enum target_object object, space, while the core was trying to write to the pre-exec address space. */ if (proc_mem_file_is_writable ()) - return linux_proc_xfer_memory_partial (readbuf, writebuf, - offset, len, xfered_len); + return linux_proc_xfer_memory_partial (inferior_ptid.pid (), readbuf, + writebuf, offset, len, + xfered_len); } return inf_ptrace_target::xfer_partial (object, annex, readbuf, writebuf, @@ -3941,12 +3943,10 @@ linux_proc_xfer_memory_partial_fd (int fd, int pid, threads. */ static enum target_xfer_status -linux_proc_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf, - ULONGEST offset, LONGEST len, - ULONGEST *xfered_len) +linux_proc_xfer_memory_partial (int pid, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST offset, + LONGEST len, ULONGEST *xfered_len) { - int pid = inferior_ptid.pid (); - auto iter = proc_mem_file_map.find (pid); if (iter == proc_mem_file_map.end ()) return TARGET_XFER_EOF;