From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 1AF6A394200C for ; Thu, 19 Mar 2020 15:46:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1AF6A394200C 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=1584632798; bh=ZAHHvZfnTGUgG/CldoO7fWTAmo9QmIlyodHTgF64bRM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=chPDGhX8ZF3g261EiCuXpVey6uXfpvF/nUJjKrHGT1NGKaxEoNDjPXHmMYiaTcopz sCkarXOwoWcycPrdz9eewT60VDr5mvMCnhdAioMY/uZjrGAmjwCAM81NmpIP0Y2wN0 j9gzNGd+vmop1afWmu7vi/tMGDIJUV87chIqpBl0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.79.191.25]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MtwUm-1jZnZy00mi-00uGM3; Thu, 19 Mar 2020 16:46:38 +0100 From: Kamil Rytarowski To: gdb-patches@sourceware.org Cc: simark@simark.ca, Kamil Rytarowski Subject: [PATCH v5] Disable get_ptrace_pid for NetBSD Date: Thu, 19 Mar 2020 16:45:55 +0100 Message-Id: <20200319154555.17566-1-n54@gmx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200319122844.24558-1-n54@gmx.com> References: <20200319122844.24558-1-n54@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Afq7NOg6OIvRL7O+wtozzemrM0vaOxt310xOyCMb+Z8U0UdImGm oP/RzYO8vKHUALwgVV7cR+n4l6y2D+B34+WCMqLUyY3iCZvHzVN8/TLqpMjSyCZpg80xRJE acwaec86m5OoSBl43tut9kz5HG6Znge/GCeyqs/8HH3gLPd8kVarVHZ0OkBP6yzDbX+o3q5 zztZmgCTlqXBdiU2V7tlg== X-UI-Out-Filterresults: notjunk:1;V03:K0:TWLna4vPn6g=:DEP3HgEZFDAAEEi5kjyWxA JWPHilBNCRZaKxg1XfxxpPpgB9SPGaztIOCSJinbvMD2+Ab34r4BwmjFV56+gRHPYLoMjv/Qj i6hE4o1+XztoCo2FvwpD0ACafUW3UpVcSR1AF0WxxJ3mWdgAbpNqFdXxEa3A8EJrELvtEBVE6 L0Y2w/gPevOpvgVNi5cedsnr05UHe9atb/cjmmHNwHIJYB2fY1FPLp8Syeij+BM3FOqNSWsto X5wrzFl+HKooj56hMO8984mthLhv7Y/EqRmmGp+grQvBJFX2C62rmep6izsMsIruWr0XBnYl/ w9xH2HpgdujkGU2nBcvhSujMK0GxKtfohRaIlG9UKePD513qVIM6TO5g2deZPRpwIR0k/X2Pd wYmYLs0gxqN3Pu9axyfUS7+JPZ3YTCb58aHmEc3breQwk9nJU0wyMMUF+CTJhfST0nTCNjFW4 M5IvLLOpOf1VW/9egpjvHiWojEjlatr53msOrvZd4AlLT9IeU75kwM6lb8nNbKi/s2641Dh2W CC7D1PFeQ7qNIDGj5ZKT8NBaDxZ40N8zRqsDFQI9Tsr6PWp9sPjbZuq/gKfnzETO9NlsrCtFS WcVbD7bdmEnP5k8QkVCNCi6jepnH+Ss6sTTzLlnPfXoJkeFSLigmdyuiivaZP3U9900IATedZ cvVkB76am5I9VFfHJXJI+chZ3LBZNLlfdOq/iz/iHOJhfO5C39RUufpYakh4j9XVGwmMC30Ns cIFqFVp8oyz2uvZAoOgYw7xXVp8HVcb2m6lma9kPhgHuv71xs7vYfTxtWy5bdNpmDlL6KeFmx 9DK+vuznW294l8VfZJktLGOpCtn8scwiGFS/mM7alQJCULD8QLQP3Ym+fy0xa3ye9TeCm67cx Vv0DRa0TbFhQY2cIZIP10t0JsmifnxU50dEoZRhG4mQBIzKBMYWwHK4mTYHJe15QwtoA3zvJz Ryv5+R1PFANmBbiCp5VwWW80/2wkk4JYwygKrh59wdbL1TZQu0drSjFaHqoQ3UodUI4KIfd5k pm3Y2ciMDMQepABL9YvfBkwKBUUFuPdGsw15zf7/iIS27kZW9/QcGiBtpNUuiujCGbgSjgsA2 FLF1JtsD1WYbRqKPClpTUDA2VZA4Pki6dHZkj8YTsoZWAzNxsmjb5wua559VJKDV2bZINkBJI xeJyWB+DV8QpVabphS0bt1pO+qFOffUPSNsaQ9sjMxG3fFvY+oXszLNeciNbzlW+L2PGY= 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, RCVD_IN_MSPIKE_H2, 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: Thu, 19 Mar 2020 15:46:44 -0000 Unlike most other Operating Systems, NetBSD tracks both pid and lwp. The process id on NetBSD is stored always in the pid field of ptid. gdb/ChangeLog: * inf-ptrace.h: Disable get_ptrace_pid on NetBSD. * inf-ptrace.c: Likewise. * (gdb_ptrace): Add. * (inf_ptrace_target::resume): Update. * (inf_ptrace_target::xfer_partial): Likewise. * (inf_ptrace_peek_poke): Change argument `pid' to `ptid'. * (inf_ptrace_peek_poke): Update. =2D-- gdb/ChangeLog | 9 +++++++++ gdb/inf-ptrace.c | 47 +++++++++++++++++++++++++++++------------------ gdb/inf-ptrace.h | 7 ++++++- 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0955d648e79..c5119224415 100644 =2D-- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2020-03-19 Kamil Rytarowski + * inf-ptrace.h: Disable get_ptrace_pid on NetBSD. + * inf-ptrace.c: Likewise. + * (gdb_ptrace): Add. + * (inf_ptrace_target::resume): Update. + * (inf_ptrace_target::xfer_partial): Likewise. + * (inf_ptrace_peek_poke): Change argument `pid' to `ptid'. + * (inf_ptrace_peek_poke): Update. + 2020-03-19 Kamil Rytarowski * x86-bsd-nat.c (gdb_ptrace): New. diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index db17a76d946..a6a77ef9d31 100644 =2D-- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -37,6 +37,18 @@ =0C +static PTRACE_TYPE_RET +gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr, + PTRACE_TYPE_ARG4 data) +{ +#ifdef __NetBSD__ + return ptrace (request, ptid.pid (), addr, data); +#else + pid_t pid =3D get_ptrace_pid (ptid); + return ptrace (request, pid, addr, data); +#endif +} + /* A unique_ptr helper to unpush a target. */ struct target_unpusher @@ -313,8 +325,9 @@ inf_ptrace_target::kill () target_mourn_inferior (inferior_ptid); } -/* Return which PID to pass to ptrace in order to observe/control the - tracee identified by PTID. */ +#ifndef __NetBSD__ + +/* See inf-ptrace.h. */ pid_t get_ptrace_pid (ptid_t ptid) @@ -328,6 +341,7 @@ get_ptrace_pid (ptid_t ptid) pid =3D ptid.pid (); return pid; } +#endif /* Resume execution of thread PTID, or all threads if PTID is -1. If STEP is nonzero, single-step it. If SIGNAL is nonzero, give it @@ -336,15 +350,12 @@ get_ptrace_pid (ptid_t ptid) void inf_ptrace_target::resume (ptid_t ptid, int step, enum gdb_signal signal) { - pid_t pid; - int request; + PTRACE_TYPE_ARG1 request; if (minus_one_ptid =3D=3D ptid) /* Resume all threads. Traditionally ptrace() only supports single-threaded processes, so simply resume the inferior. */ - pid =3D inferior_ptid.pid (); - else - pid =3D get_ptrace_pid (ptid); + ptid =3D ptid_t (inferior_ptid.pid ()); if (catch_syscall_enabled () > 0) request =3D PT_SYSCALL; @@ -365,7 +376,7 @@ inf_ptrace_target::resume (ptid_t ptid, int step, enum= gdb_signal signal) where it was. If GDB wanted it to start some other way, we have already written a new program counter value to the child. */ errno =3D 0; - ptrace (request, pid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal))= ; + gdb_ptrace (request, ptid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (sig= nal)); if (errno !=3D 0) perror_with_name (("ptrace")); } @@ -460,7 +471,7 @@ inf_ptrace_target::wait (ptid_t ptid, struct target_wa= itstatus *ourstatus, be non-null. Return the number of transferred bytes. */ static ULONGEST -inf_ptrace_peek_poke (pid_t pid, gdb_byte *readbuf, +inf_ptrace_peek_poke (ptid_t ptid, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST addr, ULONGEST len) { @@ -491,8 +502,8 @@ inf_ptrace_peek_poke (pid_t pid, gdb_byte *readbuf, if (readbuf !=3D NULL || chunk < sizeof (PTRACE_TYPE_RET)) { errno =3D 0; - buf.word =3D ptrace (PT_READ_I, pid, - (PTRACE_TYPE_ARG3)(uintptr_t) addr, 0); + buf.word =3D gdb_ptrace (PT_READ_I, ptid, + (PTRACE_TYPE_ARG3)(uintptr_t) addr, 0); if (errno !=3D 0) break; if (readbuf !=3D NULL) @@ -502,15 +513,15 @@ inf_ptrace_peek_poke (pid_t pid, gdb_byte *readbuf, { memcpy (buf.byte + skip, writebuf + n, chunk); errno =3D 0; - ptrace (PT_WRITE_D, pid, (PTRACE_TYPE_ARG3)(uintptr_t) addr, + gdb_ptrace (PT_WRITE_D, ptid, (PTRACE_TYPE_ARG3)(uintptr_t) addr, buf.word); if (errno !=3D 0) { /* Using the appropriate one (I or D) is necessary for Gould NP1, at least. */ errno =3D 0; - ptrace (PT_WRITE_I, pid, (PTRACE_TYPE_ARG3)(uintptr_t) addr, - buf.word); + gdb_ptrace (PT_WRITE_I, ptid, (PTRACE_TYPE_ARG3)(uintptr_t) addr, + buf.word); if (errno !=3D 0) break; } @@ -528,7 +539,7 @@ inf_ptrace_target::xfer_partial (enum target_object ob= ject, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { - pid_t pid =3D get_ptrace_pid (inferior_ptid); + ptid_t ptid =3D inferior_ptid; switch (object) { @@ -552,7 +563,7 @@ inf_ptrace_target::xfer_partial (enum target_object ob= ject, piod.piod_len =3D len; errno =3D 0; - if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) =3D=3D 0) + if (gdb_ptrace (PT_IO, ptid, (caddr_t)&piod, 0) =3D=3D 0) { /* Return the actual number of bytes read or written. */ *xfered_len =3D piod.piod_len; @@ -565,7 +576,7 @@ inf_ptrace_target::xfer_partial (enum target_object ob= ject, return TARGET_XFER_EOF; } #endif - *xfered_len =3D inf_ptrace_peek_poke (pid, readbuf, writebuf, + *xfered_len =3D inf_ptrace_peek_poke (ptid, readbuf, writebuf, offset, len); return *xfered_len !=3D 0 ? TARGET_XFER_OK : TARGET_XFER_EOF; @@ -588,7 +599,7 @@ inf_ptrace_target::xfer_partial (enum target_object ob= ject, piod.piod_len =3D len; errno =3D 0; - if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) =3D=3D 0) + if (gdb_ptrace (PT_IO, ptid, (caddr_t)&piod, 0) =3D=3D 0) { /* Return the actual number of bytes read or written. */ *xfered_len =3D piod.piod_len; diff --git a/gdb/inf-ptrace.h b/gdb/inf-ptrace.h index dd0733736f2..dea82d005e3 100644 =2D-- a/gdb/inf-ptrace.h +++ b/gdb/inf-ptrace.h @@ -78,9 +78,14 @@ struct inf_ptrace_target : public inf_child_target void detach_success (inferior *inf); }; +#ifndef __NetBSD__ /* Return which PID to pass to ptrace in order to observe/control the - tracee identified by PTID. */ + tracee identified by PTID. + + Unlike most other Operating Systems, NetBSD tracks both pid and lwp + and avoids this function. */ extern pid_t get_ptrace_pid (ptid_t); +#endif #endif =2D- 2.25.0