From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 89674 invoked by alias); 4 Apr 2017 19:29:35 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 89586 invoked by uid 89); 4 Apr 2017 19:29:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.8 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Apr 2017 19:29:31 +0000 Received: by simark.ca (Postfix, from userid 33) id 767F51E881; Tue, 4 Apr 2017 15:29:29 -0400 (EDT) To: John Baldwin Subject: Re: [PATCH] Use ptid from regcache instead of inferior_ptid. X-PHP-Originating-Script: 33:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 04 Apr 2017 19:29:00 -0000 From: Simon Marchi Cc: gdb-patches@sourceware.org In-Reply-To: <20170404190401.38028-1-jhb@FreeBSD.org> References: <20170404190401.38028-1-jhb@FreeBSD.org> Message-ID: X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.2.4 X-IsSubscribed: yes X-SW-Source: 2017-04/txt/msg00066.txt.bz2 On 2017-04-04 15:04, John Baldwin wrote: > gdb/ChangeLog: > > * amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers, > amd64bsd_store_inferior_registers): Use ptid from regcache. > --- > gdb/ChangeLog | 5 +++++ > gdb/amd64-bsd-nat.c | 32 ++++++++++++++------------------ > 2 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index fc8dbe18da..259acca1ce 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,8 @@ > +2017-04-04 John Baldwin > + > + * amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers, > + amd64bsd_store_inferior_registers): Use ptid from regcache. > + > 2017-04-04 Simon Marchi > > * remote.c (set_general_thread, set_continue_thread): Use ptid_t > diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c > index 5678e94d11..ca61a3551b 100644 > --- a/gdb/amd64-bsd-nat.c > +++ b/gdb/amd64-bsd-nat.c > @@ -43,13 +43,13 @@ amd64bsd_fetch_inferior_registers (struct > target_ops *ops, > struct regcache *regcache, int regnum) > { > struct gdbarch *gdbarch = get_regcache_arch (regcache); > + pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache)); > > if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, > regnum)) > { > struct reg regs; > > - if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) ®s, 0) == -1) > + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) > perror_with_name (_("Couldn't get registers")); > > amd64_supply_native_gregset (regcache, ®s, -1); > @@ -66,8 +66,8 @@ amd64bsd_fetch_inferior_registers (struct target_ops > *ops, > if (x86bsd_xsave_len != 0) > { > xstateregs = alloca (x86bsd_xsave_len); > - if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) xstateregs, 0) == -1) > + if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0) > + == -1) > perror_with_name (_("Couldn't get extended state status")); > > amd64_supply_xsave (regcache, -1, xstateregs); > @@ -75,8 +75,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops > *ops, > } > #endif > > - if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) > + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == > -1) > perror_with_name (_("Couldn't get floating point status")); > > amd64_supply_fxsave (regcache, -1, &fpregs); > @@ -91,19 +90,18 @@ amd64bsd_store_inferior_registers (struct > target_ops *ops, > struct regcache *regcache, int regnum) > { > struct gdbarch *gdbarch = get_regcache_arch (regcache); > + pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache)); > > if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, > regnum)) > { > struct reg regs; > > - if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) ®s, 0) == -1) > + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) > perror_with_name (_("Couldn't get registers")); > > amd64_collect_native_gregset (regcache, ®s, regnum); > > - if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) ®s, 0) == -1) > + if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) > perror_with_name (_("Couldn't write registers")); > > if (regnum != -1) > @@ -119,27 +117,25 @@ amd64bsd_store_inferior_registers (struct > target_ops *ops, > if (x86bsd_xsave_len != 0) > { > xstateregs = alloca (x86bsd_xsave_len); > - if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) xstateregs, 0) == -1) > + if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0) > + == -1) > perror_with_name (_("Couldn't get extended state status")); > > amd64_collect_xsave (regcache, regnum, xstateregs, 0); > > - if (ptrace (PT_SETXSTATE, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) xstateregs, x86bsd_xsave_len) == -1) > + if (ptrace (PT_SETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, > + x86bsd_xsave_len) == -1) > perror_with_name (_("Couldn't write extended state status")); > return; > } > #endif > > - if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) > + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == > -1) > perror_with_name (_("Couldn't get floating point status")); > > amd64_collect_fxsave (regcache, regnum, &fpregs); > > - if (ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid), > - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) > + if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == > -1) > perror_with_name (_("Couldn't write floating point status")); > } > Whoops, looks like an oversight on my part. Thanks!