From patchwork Tue Jul 11 16:14:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 72504 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 6877E3857702 for ; Tue, 11 Jul 2023 16:15:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6877E3857702 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689092137; bh=3TJyL9VXGTdhfrjnFX8NGe3dhiRDXcCizlSU3zWpqVA=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=H0GGJLaChWMCiNpZj7VsdqQl/ebOKOn+Vf5R61FBZBI46EnsS8eIQ5iRpMvp3a4Su nkKRYsfrSZDUyAxbHGkN0EY3k1CEozs0onI6AkHuD9Ia5mIq+Uddi6owSWlbns3e5m 9siHVbvij2bor3Bi7mTdloYDoJZWb3O9XfPpzBpQ= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 4F25D3858C31 for ; Tue, 11 Jul 2023 16:14:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F25D3858C31 Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-77ac14ff51bso200221839f.3 for ; Tue, 11 Jul 2023 09:14:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689092050; x=1691684050; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3TJyL9VXGTdhfrjnFX8NGe3dhiRDXcCizlSU3zWpqVA=; b=SR/u/WlCHnBtMtMB8f2SjXHIYxCBZqtLZ9u8kgQqATaqJtXYsc6rpWl2uAsgBNkx/x XuIF8stzws+0ggmnts4iPi0b054kVArWyCJetB96yj1cabnifM6MOe4CNuQWa9baAEkJ kYVZJJQStB+FzGEn21GPEAB5BKQDN59iQyuxvqhijEZrBFvjOUfgWyPmmGytenmyLfIi KeaWtlCLZ3nkowEubvLVvRERDw9MDfksw6TvS6kQjQJeBP9tx8rqwq8sW25YWtHohJKc 4GkCFWMwbd06TA7rXwlTEv3ShEu+m33sQPL7lnZnoo8Toapkx9Ic6oqg7ZYUi+Em/1h0 MUpA== X-Gm-Message-State: ABy/qLbhVMlkBoHZCc2JhN/nWSy5sULvYN31tBAHXAgWQxR5crrvRlyd jj4dztHwqP8V6mpsDSsCL3mQoKKfAeQmk2dcF0knyw== X-Google-Smtp-Source: APBJJlHNmYF5ZqdnkRj22StPQWN6ldxNHJ8e99RiyCAXZqH0Gf51G/E07NIL6ImeNgM/zMZZiDH0PQ== X-Received: by 2002:a5d:8894:0:b0:760:e308:107e with SMTP id d20-20020a5d8894000000b00760e308107emr15691018ioo.0.1689092050579; Tue, 11 Jul 2023 09:14:10 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id x3-20020a6bfe03000000b0077e40979b41sm702370ioh.45.2023.07.11.09.14.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 09:14:10 -0700 (PDT) Date: Tue, 11 Jul 2023 10:14:05 -0600 Subject: [PATCH v2 5/6] Introduce scoped_restore_current_inferior_for_memory MIME-Version: 1.0 Message-Id: <20230711-py-inf-fixes-30615-v2-5-64a2540864e6@adacore.com> References: <20230711-py-inf-fixes-30615-v2-0-64a2540864e6@adacore.com> In-Reply-To: <20230711-py-inf-fixes-30615-v2-0-64a2540864e6@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This introduces a new class, scoped_restore_current_inferior_for_memory, and arranges to use it in a few places. This class is intended to handle setting up and restoring the various globals that are needed to read or write memory -- but without invalidating the frame cache. I wasn't able to test the change to aix-thread.c. --- gdb/aix-thread.c | 18 ++++-------------- gdb/inferior.h | 29 +++++++++++++++++++++++++++++ gdb/proc-service.c | 10 ++-------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index fbe80d656c2..74cc67c942b 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -615,13 +615,8 @@ pdc_read_data (pthdb_user_t user_current_pid, void *buf, /* This is needed to eliminate the dependency of current thread which is null so that thread reads the correct target memory. */ { - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - inferior_ptid = ptid_t (user_current_pid); - scoped_restore_current_inferior restore_inferior; - set_current_inferior (inf); - - scoped_restore_current_program_space restore_current_progspace; - set_current_program_space (inf->pspace); + scoped_restore_current_inferior_for_memory save_inferior + (inf, ptid_t (user_current_pid)); status = target_read_memory (addr, (gdb_byte *) buf, len); } ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE; @@ -648,13 +643,8 @@ pdc_write_data (pthdb_user_t user_current_pid, void *buf, user_current_pid, (long) buf, hex_string (addr), len); { - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - inferior_ptid = ptid_t (user_current_pid); - scoped_restore_current_inferior restore_inferior; - set_current_inferior (inf); - - scoped_restore_current_program_space restore_current_progspace; - set_current_program_space (inf->pspace); + scoped_restore_current_inferior_for_memory save_inferior + (inf, ptid_t (user_current_pid)); status = target_write_memory (addr, (gdb_byte *) buf, len); } diff --git a/gdb/inferior.h b/gdb/inferior.h index caa8e4d494a..be76c456c8c 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -761,6 +761,35 @@ class scoped_restore_current_inferior inferior *m_saved_inf; }; +/* When reading memory from an inferior, the global inferior_ptid must + also be set. This class arranges to save and restore the necessary + state for reading or writing memory, but without invalidating the + frame cache. */ + +class scoped_restore_current_inferior_for_memory +{ +public: + + /* Save the current globals and switch to the given inferior and the + inferior's program space. PTID must name a thread in INF, it is + used as the new inferior_ptid. */ + scoped_restore_current_inferior_for_memory (inferior *inf, ptid_t ptid) + : m_save_ptid (&inferior_ptid) + { + set_current_inferior (inf); + set_current_program_space (inf->pspace); + inferior_ptid = ptid; + } + + DISABLE_COPY_AND_ASSIGN (scoped_restore_current_inferior_for_memory); + +private: + + scoped_restore_current_inferior m_save_inferior; + scoped_restore_current_program_space m_save_progspace; + scoped_restore_tmpl m_save_ptid; +}; + /* Traverse all inferiors. */ diff --git a/gdb/proc-service.c b/gdb/proc-service.c index 509836ec1a8..366e0510070 100644 --- a/gdb/proc-service.c +++ b/gdb/proc-service.c @@ -72,14 +72,8 @@ static ps_err_e ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr, gdb_byte *buf, size_t len, int write) { - scoped_restore_current_inferior restore_inferior; - set_current_inferior (ph->thread->inf); - - scoped_restore_current_program_space restore_current_progspace; - set_current_program_space (ph->thread->inf->pspace); - - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - inferior_ptid = ph->thread->ptid; + scoped_restore_current_inferior_for_memory save_inferior (ph->thread->inf, + ph->thread->ptid); CORE_ADDR core_addr = ps_addr_to_core_addr (addr);