yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ptid_match

Browse Source 
This removes ptid_match in favor of the ptid_t::matches method.

gdb/ChangeLog
2018-07-03  Tom Tromey  <tom@tromey.com>

	* common/ptid.c (ptid_match): Remove.
	* common/ptid.h (ptid_match): Don't declare.
	* fbsd-nat.c: Update.
	* infcmd.c: Update.
	* infrun.c: Update.
	* linux-nat.c: Update.
	* record-btrace.c: Update.
	* regcache.c: Update.
	* remote.c: Update.

gdb/gdbserver/ChangeLog
2018-07-03  Tom Tromey  <tom@tromey.com>

	* server.c: Update.
This commit is contained in:
Tom Tromey 2018-06-11 14:35:00 -06:00
parent d2a107e3f9
commit 26a57c9256
12 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@ -1,3 +1,15 @@
2018-07-03 Tom Tromey <tom@tromey.com>
* common/ptid.c (ptid_match): Remove.
* common/ptid.h (ptid_match): Don't declare.
* fbsd-nat.c: Update.
* infcmd.c: Update.
* infrun.c: Update.
* linux-nat.c: Update.
* record-btrace.c: Update.
* regcache.c: Update.
* remote.c: Update.
2018-07-03 Tom Tromey <tom@tromey.com>
* common/ptid.c (ptid_tid_p): Remove.

8
gdb/common/ptid.c
View File

@ -32,11 +32,3 @@ ptid_equal (const ptid_t &ptid1, const ptid_t &ptid2)
{
return ptid1 == ptid2;
}
/* See ptid.h. */
int
ptid_match (const ptid_t &ptid, const ptid_t &filter)
{
return ptid.matches (filter);
}

4
gdb/common/ptid.h
View File

@ -160,8 +160,4 @@ extern ptid_t minus_one_ptid;
extern int ptid_equal (const ptid_t &ptid1, const ptid_t &ptid2);
/* See ptid_t::matches. */
extern int ptid_match (const ptid_t &ptid, const ptid_t &filter);
#endif

2
gdb/fbsd-nat.c
View File

@ -1130,7 +1130,7 @@ fbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
ALL_NON_EXITED_THREADS (tp)
{
if (!ptid_match (tp->ptid, ptid))
if (!tp->ptid.matches (ptid))
continue;
if (ptrace (PT_RESUME, tp->ptid.lwp (), NULL, 0) == -1)

4
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,7 @@
2018-07-03 Tom Tromey <tom@tromey.com>
* server.c: Update.
2018-07-03 Tom Tromey <tom@tromey.com>
* linux-low.c: Update.

6
gdb/gdbserver/server.c
View File

@ -190,7 +190,7 @@ remove_all_on_match_ptid (QUEUE (notif_event_p) *q,
ptid_t filter_ptid = *(ptid_t *) data;
struct vstop_notif *vstop_event = (struct vstop_notif *) event;
if (ptid_match (vstop_event->ptid, filter_ptid))
if (vstop_event->ptid.matches (filter_ptid))
{
if (q->free_func != NULL)
q->free_func (event);
@ -229,13 +229,13 @@ in_queued_stop_replies_ptid (QUEUE (notif_event_p) *q,
ptid_t filter_ptid = *(ptid_t *) data;
struct vstop_notif *vstop_event = (struct vstop_notif *) event;
if (ptid_match (vstop_event->ptid, filter_ptid))
if (vstop_event->ptid.matches (filter_ptid))
return 0;
/* Don't resume fork children that GDB does not know about yet. */
if ((vstop_event->status.kind == TARGET_WAITKIND_FORKED
|| vstop_event->status.kind == TARGET_WAITKIND_VFORKED)
&& ptid_match (vstop_event->status.value.related_pid, filter_ptid))
&& vstop_event->status.value.related_pid.matches (filter_ptid))
return 0;
return 1;

2
gdb/infcmd.c
View File

@ -1351,7 +1351,7 @@ signal_command (const char *signum_exp, int from_tty)
{
if (ptid_equal (tp->ptid, inferior_ptid))
continue;
if (!ptid_match (tp->ptid, resume_ptid))
if (!tp->ptid.matches (resume_ptid))
continue;
if (tp->suspend.stop_signal != GDB_SIGNAL_0

12
gdb/infrun.c
View File

@ -2877,7 +2877,7 @@ clear_proceed_status (int step)
we're about to resume, implicitly and explicitly. */
ALL_NON_EXITED_THREADS (tp)
{
if (!ptid_match (tp->ptid, resume_ptid))
if (!tp->ptid.matches (resume_ptid))
continue;
clear_proceed_status_thread (tp);
}
@ -3095,7 +3095,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal)
continue;
/* Ignore threads of processes we're not resuming. */
if (!ptid_match (tp->ptid, resume_ptid))
if (!tp->ptid.matches (resume_ptid))
continue;
if (!thread_still_needs_step_over (tp))
@ -3149,7 +3149,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal)
ALL_NON_EXITED_THREADS (tp)
{
/* Ignore threads of processes we're not resuming. */
if (!ptid_match (tp->ptid, resume_ptid))
if (!tp->ptid.matches (resume_ptid))
continue;
if (tp->resumed)
@ -3291,7 +3291,7 @@ infrun_thread_stop_requested (ptid_t ptid)
thread had been temporarily paused for some step-over), set up
for reporting the stop now. */
ALL_NON_EXITED_THREADS (tp)
if (ptid_match (tp->ptid, ptid))
if (tp->ptid.matches (ptid))
{
if (tp->state != THREAD_RUNNING)
continue;
@ -3453,7 +3453,7 @@ random_pending_event_thread (ptid_t waiton_ptid)
/* First see how many events we have. Count only resumed threads
that have an event pending. */
ALL_NON_EXITED_THREADS (event_tp)
if (ptid_match (event_tp->ptid, waiton_ptid)
if (event_tp->ptid.matches (waiton_ptid)
&& event_tp->resumed
&& event_tp->suspend.waitstatus_pending_p)
num_events++;
@ -3472,7 +3472,7 @@ random_pending_event_thread (ptid_t waiton_ptid)
/* Select the Nth thread that has had an event. */
ALL_NON_EXITED_THREADS (event_tp)
if (ptid_match (event_tp->ptid, waiton_ptid)
if (event_tp->ptid.matches (waiton_ptid)
&& event_tp->resumed
&& event_tp->suspend.waitstatus_pending_p)
if (random_selector-- == 0)

4
gdb/linux-nat.c
View File

@ -958,7 +958,7 @@ iterate_over_lwps (ptid_t filter,
{
lpnext = lp->next;
if (ptid_match (lp->ptid, filter))
if (lp->ptid.matches (filter))
{
if ((*callback) (lp, data) != 0)
return lp;
@ -3513,7 +3513,7 @@ resume_stopped_resumed_lwps (struct lwp_info *lp, void *data)
/* Don't bother if there's a breakpoint at PC that we'd hit
immediately, and we're not waiting for this LWP. */
if (!ptid_match (lp->ptid, *wait_ptid_p))
if (!lp->ptid.matches (*wait_ptid_p))
{
if (breakpoint_inserted_here_p (regcache->aspace (), pc))
leave_stopped = 1;

14
gdb/record-btrace.c
View File

@ -1401,7 +1401,7 @@ record_btrace_target::record_is_replaying (ptid_t ptid)
struct thread_info *tp;
ALL_NON_EXITED_THREADS (tp)
if (ptid_match (tp->ptid, ptid) && btrace_is_replaying (tp))
if (tp->ptid.matches (ptid) && btrace_is_replaying (tp))
return true;
return false;
@ -2178,12 +2178,12 @@ record_btrace_target::resume (ptid_t ptid, int step, enum gdb_signal signal)
For all-stop targets, we only step INFERIOR_PTID and continue others. */
if (!target_is_non_stop_p ())
{
gdb_assert (ptid_match (inferior_ptid, ptid));
gdb_assert (inferior_ptid.matches (ptid));
ALL_NON_EXITED_THREADS (tp)
if (ptid_match (tp->ptid, ptid))
if (tp->ptid.matches (ptid))
{
if (ptid_match (tp->ptid, inferior_ptid))
if (tp->ptid.matches (inferior_ptid))
record_btrace_resume_thread (tp, flag);
else
record_btrace_resume_thread (tp, cflag);
@ -2192,7 +2192,7 @@ record_btrace_target::resume (ptid_t ptid, int step, enum gdb_signal signal)
else
{
ALL_NON_EXITED_THREADS (tp)
if (ptid_match (tp->ptid, ptid))
if (tp->ptid.matches (ptid))
record_btrace_resume_thread (tp, flag);
}
@ -2555,7 +2555,7 @@ record_btrace_target::wait (ptid_t ptid, struct target_waitstatus *status,
ALL_NON_EXITED_THREADS (tp)
{
if (ptid_match (tp->ptid, ptid)
if (tp->ptid.matches (ptid)
&& ((tp->btrace.flags & (BTHR_MOVE | BTHR_STOP)) != 0))
moving.push_back (tp);
}
@ -2682,7 +2682,7 @@ record_btrace_target::stop (ptid_t ptid)
struct thread_info *tp;
ALL_NON_EXITED_THREADS (tp)
if (ptid_match (tp->ptid, ptid))
if (tp->ptid.matches (ptid))
{
tp->btrace.flags &= ~BTHR_MOVE;
tp->btrace.flags |= BTHR_STOP;

6
gdb/regcache.c
View File

@ -452,7 +452,7 @@ registers_changed_ptid (ptid_t ptid)
it != regcache::current_regcache.end ();
)
{
if (ptid_match ((*it)->ptid (), ptid))
if ((*it)->ptid ().matches (ptid))
{
delete *it;
it = regcache::current_regcache.erase_after (oit);
@ -461,13 +461,13 @@ registers_changed_ptid (ptid_t ptid)
oit = it++;
}
if (ptid_match (current_thread_ptid, ptid))
if (current_thread_ptid.matches (ptid))
{
current_thread_ptid = null_ptid;
current_thread_arch = NULL;
}
if (ptid_match (inferior_ptid, ptid))
if (inferior_ptid.matches (ptid))
{
/* We just deleted the regcache of the current thread. Need to
forget about any frames we have cached, too. */

2
gdb/remote.c
View File

@ -6075,7 +6075,7 @@ remote_target::append_pending_thread_resumptions (char *p, char *endp,
struct thread_info *thread;
ALL_NON_EXITED_THREADS (thread)
if (ptid_match (thread->ptid, ptid)
if (thread->ptid.matches (ptid)
&& !ptid_equal (inferior_ptid, thread->ptid)
&& thread->suspend.stop_signal != GDB_SIGNAL_0)
{