[PATCH v3] Disable get_ptrace_pid for NetBSD
Kamil Rytarowski
n54@gmx.com
Wed Mar 18 23:16:51 GMT 2020
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.
---
gdb/ChangeLog | 10 ++++++++++
gdb/inf-ptrace.c | 45 +++++++++++++++++++++++++++++----------------
gdb/inf-ptrace.h | 7 ++++++-
3 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84964dc00ac..f09b4d154c5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2020-03-18 Kamil Rytarowski <n54@gmx.com>
+
+ * 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-17 Kamil Rytarowski <n54@gmx.com>
* regformats/regdef.h: Put reg in gdb namespace.
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index db17a76d946..4003b888616 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -37,6 +37,18 @@
+static int
+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 = 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 = 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,14 @@ 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;
if (minus_one_ptid == ptid)
/* Resume all threads. Traditionally ptrace() only supports
single-threaded processes, so simply resume the inferior. */
- pid = inferior_ptid.pid ();
+ ptid = inferior_ptid;
else
- pid = get_ptrace_pid (ptid);
+ ptid = ptid_t (inferior_ptid.pid ());
if (catch_syscall_enabled () > 0)
request = PT_SYSCALL;
@@ -365,7 +378,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 = 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 (signal));
if (errno != 0)
perror_with_name (("ptrace"));
}
@@ -460,7 +473,7 @@ inf_ptrace_target::wait (ptid_t ptid, struct target_waitstatus *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 +504,8 @@ inf_ptrace_peek_poke (pid_t pid, gdb_byte *readbuf,
if (readbuf != NULL || chunk < sizeof (PTRACE_TYPE_RET))
{
errno = 0;
- buf.word = ptrace (PT_READ_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t) addr, 0);
+ buf.word = gdb_ptrace (PT_READ_I, ptid,
+ (PTRACE_TYPE_ARG3)(uintptr_t) addr, 0);
if (errno != 0)
break;
if (readbuf != NULL)
@@ -502,15 +515,15 @@ inf_ptrace_peek_poke (pid_t pid, gdb_byte *readbuf,
{
memcpy (buf.byte + skip, writebuf + n, chunk);
errno = 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 != 0)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 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 != 0)
break;
}
@@ -528,7 +541,7 @@ inf_ptrace_target::xfer_partial (enum target_object object,
const gdb_byte *writebuf,
ULONGEST offset, ULONGEST len, ULONGEST *xfered_len)
{
- pid_t pid = get_ptrace_pid (inferior_ptid);
+ ptid_t ptid = inferior_ptid;
switch (object)
{
@@ -552,7 +565,7 @@ inf_ptrace_target::xfer_partial (enum target_object object,
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (gdb_ptrace (PT_IO, ptid, (caddr_t)&piod, 0) == 0)
{
/* Return the actual number of bytes read or written. */
*xfered_len = piod.piod_len;
@@ -565,7 +578,7 @@ inf_ptrace_target::xfer_partial (enum target_object object,
return TARGET_XFER_EOF;
}
#endif
- *xfered_len = inf_ptrace_peek_poke (pid, readbuf, writebuf,
+ *xfered_len = inf_ptrace_peek_poke (ptid, readbuf, writebuf,
offset, len);
return *xfered_len != 0 ? TARGET_XFER_OK : TARGET_XFER_EOF;
@@ -588,7 +601,7 @@ inf_ptrace_target::xfer_partial (enum target_object object,
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (gdb_ptrace (PT_IO, ptid, (caddr_t)&piod, 0) == 0)
{
/* Return the actual number of bytes read or written. */
*xfered_len = piod.piod_len;
diff --git a/gdb/inf-ptrace.h b/gdb/inf-ptrace.h
index dd0733736f2..dea82d005e3 100644
--- 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
--
2.25.0
More information about the Gdb-patches
mailing list