diff options
Diffstat (limited to 'gdb/gdbserver')
-rw-r--r-- | gdb/gdbserver/ChangeLog | 13 | ||||
-rw-r--r-- | gdb/gdbserver/linux-low.c | 8 | ||||
-rw-r--r-- | gdb/gdbserver/linux-mips-low.c | 2 | ||||
-rw-r--r-- | gdb/gdbserver/lynx-low.c | 4 | ||||
-rw-r--r-- | gdb/gdbserver/mem-break.c | 2 | ||||
-rw-r--r-- | gdb/gdbserver/nto-low.c | 8 | ||||
-rw-r--r-- | gdb/gdbserver/remote-utils.c | 6 | ||||
-rw-r--r-- | gdb/gdbserver/server.c | 8 | ||||
-rw-r--r-- | gdb/gdbserver/spu-low.c | 2 | ||||
-rw-r--r-- | gdb/gdbserver/target.c | 8 | ||||
-rw-r--r-- | gdb/gdbserver/tracepoint.c | 2 |
11 files changed, 38 insertions, 25 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 71f3e16..5aee98c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,6 +1,19 @@ 2018-07-03 Tom Tromey <tom@tromey.com> * linux-low.c: Update. + * linux-mips-low.c: Update. + * lynx-low.c: Update. + * mem-break.c: Update. + * nto-low.c: Update. + * remote-utils.c: Update. + * server.c: Update. + * spu-low.c: Update. + * target.c: Update. + * tracepoint.c: Update. + +2018-07-03 Tom Tromey <tom@tromey.com> + + * linux-low.c: Update. * linux-ppc-low.c: Update. * linux-x86-low.c: Update. * proc-service.c: Update. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index a5e0d5b..99a7e16 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -530,7 +530,7 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat) debug_printf ("HEW: Got fork event from LWP %ld, " "new child is %d\n", ptid_get_lwp (ptid_of (event_thr)), - ptid_get_pid (ptid)); + ptid.pid ()); } /* Add the new process to the tables and clone the breakpoint @@ -699,7 +699,7 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat) /* Get the event ptid. */ event_ptid = ptid_of (event_thr); - event_pid = ptid_get_pid (event_ptid); + event_pid = event_ptid.pid (); /* Save the syscall list from the execing process. */ proc = get_thread_process (event_thr); @@ -1323,7 +1323,7 @@ static void kill_wait_lwp (struct lwp_info *lwp) { struct thread_info *thr = get_lwp_thread (lwp); - int pid = ptid_get_pid (ptid_of (thr)); + int pid = ptid_of (thr).pid (); int lwpid = ptid_get_lwp (ptid_of (thr)); int wstat; int res; @@ -4546,7 +4546,7 @@ linux_set_resume_request (thread_info *thread, thread_resume *resume, size_t n) || ptid == thread->id /* Handle both 'pPID' and 'pPID.-1' as meaning 'all threads of PID'. */ - || (ptid_get_pid (ptid) == pid_of (thread) + || (ptid.pid () == pid_of (thread) && (ptid_is_pid (ptid) || ptid_get_lwp (ptid) == -1))) { diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 17fb897..f61c294 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -440,7 +440,7 @@ static void mips_linux_prepare_to_resume (struct lwp_info *lwp) { ptid_t ptid = ptid_of (get_lwp_thread (lwp)); - struct process_info *proc = find_process_pid (ptid_get_pid (ptid)); + struct process_info *proc = find_process_pid (ptid.pid ()); struct arch_process_info *priv = proc->priv->arch_private; if (lwp->arch_private->watch_registers_changed) diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c index b19ea62..b637ef9 100644 --- a/gdb/gdbserver/lynx-low.c +++ b/gdb/gdbserver/lynx-low.c @@ -83,7 +83,7 @@ lynx_ptid_t (int pid, long tid) static int lynx_ptid_get_pid (ptid_t ptid) { - return ptid_get_pid (ptid); + return ptid.pid (); } /* Return the LynxOS tid of the given PTID. */ @@ -352,7 +352,7 @@ lynx_resume (struct thread_resume *resume_info, size_t n) if (ptid_equal (ptid, minus_one_ptid)) ptid = ptid_of (current_thread); - regcache_invalidate_pid (ptid_get_pid (ptid)); + regcache_invalidate_pid (ptid.pid ()); errno = 0; lynx_ptrace (request, ptid, 1, signal, 0); diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c index 4c10fbb..7ad8c48 100644 --- a/gdb/gdbserver/mem-break.c +++ b/gdb/gdbserver/mem-break.c @@ -1482,7 +1482,7 @@ set_single_step_breakpoint (CORE_ADDR stop_at, ptid_t ptid) { struct single_step_breakpoint *bp; - gdb_assert (ptid_get_pid (current_ptid) == ptid_get_pid (ptid)); + gdb_assert (current_ptid.pid () == ptid.pid ()); bp = (struct single_step_breakpoint *) set_breakpoint_type_at (single_step_breakpoint, stop_at, NULL); diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c index ed28426..6a05d2b 100644 --- a/gdb/gdbserver/nto-low.c +++ b/gdb/gdbserver/nto-low.c @@ -91,7 +91,7 @@ nto_set_thread (ptid_t ptid) { int res = 0; - TRACE ("%s pid: %d tid: %ld\n", __func__, ptid_get_pid (ptid), + TRACE ("%s pid: %d tid: %ld\n", __func__, ptid.pid (), ptid_get_lwp (ptid)); if (nto_inferior.ctl_fd != -1 && !ptid_equal (ptid, null_ptid) @@ -430,9 +430,9 @@ nto_thread_alive (ptid_t ptid) { int res; - TRACE ("%s pid:%d tid:%d\n", __func__, ptid_get_pid (ptid), + TRACE ("%s pid:%d tid:%d\n", __func__, ptid.pid (), ptid_get_lwp (ptid)); - if (SignalKill (0, ptid_get_pid (ptid), ptid_get_lwp (ptid), + if (SignalKill (0, ptid.pid (), ptid_get_lwp (ptid), 0, 0, 0) == -1) res = 0; else @@ -582,7 +582,7 @@ nto_wait (ptid_t ptid, int waitval = 0; TRACE (" TERMINATED\n"); - waitpid (ptid_get_pid (ptid), &waitval, WNOHANG); + waitpid (ptid.pid (), &waitval, WNOHANG); if (nto_inferior.exit_signo) { /* Abnormal death. */ diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index a1a06dc..400c2be 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -486,7 +486,7 @@ write_ptid (char *buf, ptid_t ptid) if (cs.multi_process) { - pid = ptid_get_pid (ptid); + pid = ptid.pid (); if (pid < 0) buf += sprintf (buf, "p-%x.", -pid); else @@ -1261,14 +1261,14 @@ prepare_resume_reply (char *buf, ptid_t ptid, case TARGET_WAITKIND_EXITED: if (cs.multi_process) sprintf (buf, "W%x;process:%x", - status->value.integer, ptid_get_pid (ptid)); + status->value.integer, ptid.pid ()); else sprintf (buf, "W%02x", status->value.integer); break; case TARGET_WAITKIND_SIGNALLED: if (cs.multi_process) sprintf (buf, "X%x;process:%x", - status->value.sig, ptid_get_pid (ptid)); + status->value.sig, ptid.pid ()); else sprintf (buf, "X%02x", status->value.sig); break; diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index c2f7287..28bc9de 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1205,7 +1205,7 @@ handle_detach (char *own_buf) pid = strtol (&own_buf[2], NULL, 16); } else - pid = ptid_get_pid (current_ptid); + pid = current_ptid.pid (); if ((tracing && disconnected_tracing) || any_persistent_commands ()) { @@ -2180,7 +2180,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (current_thread == NULL) { current_thread - = find_any_thread_of_pid (ptid_get_pid (cs.general_thread)); + = find_any_thread_of_pid (cs.general_thread.pid ()); /* Just in case, if we didn't find a thread, then bail out instead of crashing. */ @@ -2698,7 +2698,7 @@ visit_actioned_threads (thread_info *thread, if (ptid_equal (action->thread, minus_one_ptid) || ptid_equal (action->thread, thread->id) - || ((ptid_get_pid (action->thread) + || ((action->thread.pid () == thread->id.pid ()) && ptid_get_lwp (action->thread) == -1)) { @@ -4427,7 +4427,7 @@ handle_target_event (int err, gdb_client_data client_data) } else if (cs.last_status.kind != TARGET_WAITKIND_IGNORE) { - int pid = ptid_get_pid (cs.last_ptid); + int pid = cs.last_ptid.pid (); struct process_info *process = find_process_pid (pid); int forward_event = !gdb_connected () || process->gdb_detached; diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 8a221a2..3436d39 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -418,7 +418,7 @@ spu_resume (struct thread_resume *resume_info, size_t n) static ptid_t spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options) { - int pid = ptid_get_pid (ptid); + int pid = ptid.pid (); int w; int ret; diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index c276329..400d458 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -248,7 +248,7 @@ target_wait (ptid_t ptid, struct target_waitstatus *status, int options) void target_mourn_inferior (ptid_t ptid) { - (*the_target->mourn) (find_process_pid (ptid_get_pid (ptid))); + (*the_target->mourn) (find_process_pid (ptid.pid ())); } /* See target/target.h. */ @@ -320,13 +320,13 @@ target_pid_to_str (ptid_t ptid) xsnprintf (buf, sizeof (buf), "<null thread>"); else if (ptid_get_tid (ptid) != 0) xsnprintf (buf, sizeof (buf), "Thread %d.0x%lx", - ptid_get_pid (ptid), ptid_get_tid (ptid)); + ptid.pid (), ptid_get_tid (ptid)); else if (ptid_get_lwp (ptid) != 0) xsnprintf (buf, sizeof (buf), "LWP %d.%ld", - ptid_get_pid (ptid), ptid_get_lwp (ptid)); + ptid.pid (), ptid_get_lwp (ptid)); else xsnprintf (buf, sizeof (buf), "Process %d", - ptid_get_pid (ptid)); + ptid.pid ()); return buf; } diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index c203080..ad2a801 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -6835,7 +6835,7 @@ static int run_inferior_command (char *cmd, int len) { int err = -1; - int pid = ptid_get_pid (current_ptid); + int pid = current_ptid.pid (); trace_debug ("run_inferior_command: running: %s", cmd); |