From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id D57993877023 for ; Tue, 17 Mar 2020 18:19:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D57993877023 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=n54@gmx.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1584469145; bh=tRs1ofNaSHkZSyAotVB53Ycah9HDtSK067sBF3igoeI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=OS8vZZii1ymXB7z4ONfbHJASFz006AtKdLvL82aa/90nCZXzW+yng9e3AU+LaTjds N9wOOFhLfFKpzogdkrHCQiaRLqvmPqS9KPDxLLvi+M+ECJR3V8CAQmDqnmOj9Hu6Od M6RulTKgemdO6RzyK2zBpbo3M1gc49mW/D1Jcw+E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.79.191.25]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MlNtP-1jhs041tvB-00lkvL; Tue, 17 Mar 2020 19:19:05 +0100 From: Kamil Rytarowski To: gdb-patches@sourceware.org Cc: simark@simark.ca, cbiesinger@google.com, Kamil Rytarowski Subject: [PATCH v5] Add support for NetBSD threads in sparc-nat.c Date: Tue, 17 Mar 2020 19:18:26 +0100 Message-Id: <20200317181826.6947-1-n54@gmx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200317164603.10840-1-n54@gmx.com> References: <20200317164603.10840-1-n54@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:czxLtKfWRoXWUghgE3gdGsVJvKLw9+Lf4da76lqYoXftpwt+0yZ PRwpOfkv8p/BWdBIWeayB1yYYZs2+/CDU6eqSKVXVLSkv/3Gz/OoV0j0W1M9SNhpxsnWQfI xmWXOh0MQkBOUyh6b/rdZpYp1DFDIehM6Nw20oaSZ3FkdNBRFFGszygBAwXLqcvaNDfFZf0 /crTiuhm2eVJRaGaEga+Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:We6+XclaDM8=:hVgeNSnvN6TvkNVnrAxuIl GwiRkDQcnC5o0dSSyQlBZBDeiTawMnIlV/zkuJkJWO5weL0o+vXcdk2jZa1xbjEY5Ytbd3tyN J85mOvNXDNph6VA6AtC//Bt0yj0Xic3xdpgqMQ+ORZ9jiuVbKWtZfXbVmUc+vpH3tJM8p5bSl KpJIdMYLUqVX5UkEF5J/97O+Bn+xPlN2fIfpCHOXQiEBMevexepgZ0dwtBr4Z7TivzCUk4ieV MTSMz9QYFL8RonevbAafcXi5VDhP5PsxJbsuQxa4/ekNVggYP7+v2xgBc+I0cYWOqNrenai6u wYRfXpfMv3/4eS0CUbwcXNZdSuBFX5obaFVpM+0DR2G6RFFCrTTBBv1FQRGI/xYw3FxQUB1H0 iQjU1gEZohe7HfVPXpcBTy6IvtubLZ2REr7drDbekE840vRyEoxxCfnZyR3fUOCFxYdJnHnTh dM2GMUEUDAcARDy0ZTQi+osiDiEPA5R8qr3t4Js6nJeipLG5OVNLn0hd68KPo1nNwfTrinyyQ H/aghLQFPd0q+yx1/p2X5Fi43L4MjciN5H77dyuBUT9WBHdvU8Wc89rwlJulFPcuFLailbUZy hNHxS2pqNxmp8YHj+P0x0hNI0nPy3jTrBcjqv6SghLHdhEM9OQdAQ9VaSDeYB/zodqnkWrr/p k2rnvFUVtSc+sxGCPUWJ2KAls/nln7dS15rSbthQ5RYms0WZ2sX+COhSBUOVNcPuYjwNqlquf jnmYXor9DMVI7fJ1qj4S51WJaeCutoJUBiWZudpSQniy0SiAZa/6W//tm14IORUsK2OiU4zQJ TmJHlyjxjaie3iUPevIza5cCj4VGGjskTAHtgcOnnwlL9j9uT8UFJNswDqQfOUBZp8ssateV+ QlvSvU6wKugkxvdf491skRd0ChMftYNdw+71cBNTS9RPN9JHeDcT88+E/YzbkXNTlbsKv98LT FHg/zqU+sB3EfJ3fkqGCUU0toJa+oJaZRB9A2mkTLL/FOO7PU9YIakoeqI5S62STbWn/1O9Gn Y0GKtQRVF7OS13PNAi0BwrHD4IGINRGJ6bIxFeCYtehlCOE7d/bljWNehfvJEkbfGbXfuKc+j cL93u60IL63qbcBG6rp9YHnOU1d8AApUoFz8Ps1qRmTZt5HAKxoNeP6odXaKc0y3UM5iyYw20 X/ATwQmvH4msS0ZN2xXuPioKazLXKFYBbbOPpaD2OhcQPTbUPtXBgfazsVRfVyTwBun1A= X-Spam-Status: No, score=-25.4 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS 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: Tue, 17 Mar 2020 18:19:12 -0000 NetBSD ptrace(2) accepts thread id (LWP) as the 4th argument for threads. Define gdb_ptrace() a wrapper function for ptrace(2) that properly passes the pid,lwp pair on NetBSD and the result of get_ptrace_pid() for others. =2D-- gdb/sparc-nat.c | 50 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c index dff0f521565..fadcfd34474 100644 =2D-- a/gdb/sparc-nat.c +++ b/gdb/sparc-nat.c @@ -78,6 +78,19 @@ typedef struct fp_status fpregset_t; #define PTRACE_SETFPREGS PT_SETFPREGS #endif +static int +gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr) +{ +#ifdef __NetBSD__ + /* Support for NetBSD threads: unlike other ptrace implementations in t= his + file, NetBSD requires that we pass both the pid and lwp. */ + return ptrace (request, ptid.pid (), addr, ptid.lwp ()); +#else + pid_t pid =3D get_ptrace_pid (ptid); + return ptrace (request, pid, addr, 0); +#endif +} + /* Register set description. */ const struct sparc_gregmap *sparc_gregmap; const struct sparc_fpregmap *sparc_fpregmap; @@ -137,22 +150,7 @@ void sparc_fetch_inferior_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch =3D regcache->arch (); - pid_t pid; - - /* NOTE: cagney/2002-12-03: This code assumes that the currently - selected light weight processes' registers can be written - directly into the selected thread's register cache. This works - fine when given an 1:1 LWP:thread model (such as found on - GNU/Linux) but will, likely, have problems when used on an N:1 - (userland threads) or N:M (userland multiple LWP) model. In the - case of the latter two, the LWP's registers do not necessarily - belong to the selected thread (the LWP could be in the middle of - executing the thread switch code). - - These functions should instead be parameterized with an explicit - object (struct regcache, struct thread_info?) into which the LWPs - registers can be written. */ - pid =3D get_ptrace_pid (regcache->ptid ()); + ptid_t ptid =3D regcache->ptid (); if (regnum =3D=3D SPARC_G0_REGNUM) { @@ -166,7 +164,7 @@ sparc_fetch_inferior_registers (struct regcache *regca= che, int regnum) { gregset_t regs; - if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) =3D= =3D -1) + if (gdb_ptrace (PTRACE_GETREGS, ptid, (PTRACE_TYPE_ARG3) ®s) =3D= =3D -1) perror_with_name (_("Couldn't get registers")); sparc_supply_gregset (sparc_gregmap, regcache, -1, ®s); @@ -178,7 +176,7 @@ sparc_fetch_inferior_registers (struct regcache *regca= che, int regnum) { fpregset_t fpregs; - if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) = =3D=3D -1) + if (gdb_ptrace (PTRACE_GETFPREGS, ptid, (PTRACE_TYPE_ARG3) &fpregs)= =3D=3D -1) perror_with_name (_("Couldn't get floating point status")); sparc_supply_fpregset (sparc_fpregmap, regcache, -1, &fpregs); @@ -189,22 +187,18 @@ void sparc_store_inferior_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch =3D regcache->arch (); - pid_t pid; - - /* NOTE: cagney/2002-12-02: See comment in fetch_inferior_registers - about threaded assumptions. */ - pid =3D get_ptrace_pid (regcache->ptid ()); + ptid_t ptid =3D regcache->ptid (); if (regnum =3D=3D -1 || sparc_gregset_supplies_p (gdbarch, regnum)) { gregset_t regs; - if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) =3D= =3D -1) + if (gdb_ptrace (PTRACE_GETREGS, ptid, (PTRACE_TYPE_ARG3) ®s) =3D= =3D -1) perror_with_name (_("Couldn't get registers")); sparc_collect_gregset (sparc_gregmap, regcache, regnum, ®s); - if (ptrace (PTRACE_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) =3D= =3D -1) + if (gdb_ptrace (PTRACE_SETREGS, ptid, (PTRACE_TYPE_ARG3) ®s) =3D= =3D -1) perror_with_name (_("Couldn't write registers")); /* Deal with the stack regs. */ @@ -225,7 +219,7 @@ sparc_store_inferior_registers (struct regcache *regca= che, int regnum) { fpregset_t fpregs, saved_fpregs; - if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) = =3D=3D -1) + if (gdb_ptrace (PTRACE_GETFPREGS, ptid, (PTRACE_TYPE_ARG3) &fpregs)= =3D=3D -1) perror_with_name (_("Couldn't get floating-point registers")); memcpy (&saved_fpregs, &fpregs, sizeof (fpregs)); @@ -237,8 +231,8 @@ sparc_store_inferior_registers (struct regcache *regca= che, int regnum) to write the registers if nothing changed. */ if (memcmp (&saved_fpregs, &fpregs, sizeof (fpregs)) !=3D 0) { - if (ptrace (PTRACE_SETFPREGS, pid, - (PTRACE_TYPE_ARG3) &fpregs, 0) =3D=3D -1) + if (gdb_ptrace (PTRACE_SETFPREGS, ptid, + (PTRACE_TYPE_ARG3) &fpregs) =3D=3D -1) perror_with_name (_("Couldn't write floating-point registers")); } =2D- 2.25.0