From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.baldwin.cx (bigwig.baldwin.cx [66.216.25.90]) by sourceware.org (Postfix) with ESMTPS id D358B388CC0A for ; Fri, 28 May 2021 20:27:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D358B388CC0A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=jhb@FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 50BF51A84E2F for ; Fri, 28 May 2021 16:27:21 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 4/5] aarch64-fbsd-nat: Use fetch_register_set and store_register_set. Date: Fri, 28 May 2021 13:26:13 -0700 Message-Id: <20210528202614.2081-5-jhb@FreeBSD.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210528202614.2081-1-jhb@FreeBSD.org> References: <20210528202614.2081-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Fri, 28 May 2021 16:27:21 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Fri, 28 May 2021 20:27:24 -0000 gdb/ChangeLog: * aarch64-fbsd-nat.c (getregs_supplies, getfpregs_supplies): Remove. (aarch64_fbsd_nat_target::fetch_registers): Use fetch_register_set. (aarch64_fbsd_nat_target::store_registers): Use store_register_set. --- gdb/ChangeLog | 9 +++++ gdb/aarch64-fbsd-nat.c | 77 +++++------------------------------------- 2 files changed, 17 insertions(+), 69 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index efee8edbbf4..5ff827aa07e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2021-05-28 John Baldwin + + * aarch64-fbsd-nat.c (getregs_supplies, getfpregs_supplies): + Remove. + (aarch64_fbsd_nat_target::fetch_registers): Use + fetch_register_set. + (aarch64_fbsd_nat_target::store_registers): Use + store_register_set. + 2021-05-28 John Baldwin * riscv-fbsd-nat.c (getregs_supplies, getfpregs_supplies): Remove. diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c index 275f9b6a32f..4442c9fa624 100644 --- a/gdb/aarch64-fbsd-nat.c +++ b/gdb/aarch64-fbsd-nat.c @@ -26,7 +26,6 @@ #include #include "fbsd-nat.h" -#include "aarch64-tdep.h" #include "aarch64-fbsd-tdep.h" #include "inf-ptrace.h" @@ -38,22 +37,6 @@ struct aarch64_fbsd_nat_target final : public fbsd_nat_target static aarch64_fbsd_nat_target the_aarch64_fbsd_nat_target; -/* Determine if PT_GETREGS fetches REGNUM. */ - -static bool -getregs_supplies (int regnum) -{ - return (regnum >= AARCH64_X0_REGNUM && regnum <= AARCH64_CPSR_REGNUM); -} - -/* Determine if PT_GETFPREGS fetches REGNUM. */ - -static bool -getfpregs_supplies (int regnum) -{ - return (regnum >= AARCH64_V0_REGNUM && regnum <= AARCH64_FPCR_REGNUM); -} - /* Fetch register REGNUM from the inferior. If REGNUM is -1, do this for all registers. */ @@ -61,29 +44,10 @@ void aarch64_fbsd_nat_target::fetch_registers (struct regcache *regcache, int regnum) { - pid_t pid = get_ptrace_pid (regcache->ptid ()); - - if (regnum == -1 || getregs_supplies (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't get registers")); - - regcache->supply_regset (&aarch64_fbsd_gregset, regnum, ®s, - sizeof (regs)); - } - - if (regnum == -1 || getfpregs_supplies (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't get floating point status")); - - regcache->supply_regset (&aarch64_fbsd_fpregset, regnum, &fpregs, - sizeof (fpregs)); - } + fetch_register_set (regcache, regnum, PT_GETREGS, + &aarch64_fbsd_gregset); + fetch_register_set (regcache, regnum, PT_GETFPREGS, + &aarch64_fbsd_fpregset); } /* Store register REGNUM back into the inferior. If REGNUM is -1, do @@ -93,35 +57,10 @@ void aarch64_fbsd_nat_target::store_registers (struct regcache *regcache, int regnum) { - pid_t pid = get_ptrace_pid (regcache->ptid ()); - - if (regnum == -1 || getregs_supplies (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't get registers")); - - regcache->collect_regset (&aarch64_fbsd_gregset, regnum, ®s, - sizeof (regs)); - - if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't write registers")); - } - - if (regnum == -1 || getfpregs_supplies (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't get floating point status")); - - regcache->collect_regset (&aarch64_fbsd_fpregset, regnum, &fpregs, - sizeof (fpregs)); - - if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't write floating point status")); - } + store_register_set (regcache, regnum, PT_GETREGS, PT_SETREGS, + &aarch64_fbsd_gregset); + store_register_set (regcache, regnum, PT_GETFPREGS, + PT_SETFPREGS, &aarch64_fbsd_fpregset); } void _initialize_aarch64_fbsd_nat (); -- 2.31.1