From d2306b37658ef5019021135429c2e7c8e0d09be4 Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Mon, 30 Sep 2013 11:50:10 +0000 Subject: * aarch64-linux-nat.c: Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. Replace GET_LWP with ptid_get_lwp. * aix-thread.c (BUILD_THREAD, BUILD_LWP): Remove. Replace BUILD_THREAD with ptid_build. Replace BUILD_LWP with ptid_build. Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. * alphabsd-nat.c: Replace PIDGET with ptid_get_pid. * amd64-linux-nat.c: Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. * amd64bsd-nat.c: Replace PIDGET with ptid_get_pid. * arm-linux-nat.c: Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. Replace GET_LWP with ptid_get_lwp. * armnbsd-nat.c: Replace PIDGET with ptid_get_pid. * auxv.c: Likewise. * breakpoint.c: Likewise. * common/ptid.c (ptid_is_pid): Condense check for null_ptid and minus_one_ptid. (ptid_lwp_p): New function. (ptid_tid_p): New function. * common/ptid.h: Update comments for accessors. (ptid_lwp_p): New prototype. (ptid_tid_p): New prototype. * defs.h (PIDGET, TIDGET, MERGEPID): Do not define. * gcore.c: Replace PIDGET with ptid_get_pid. * gdbthread.h: Likewise. * gnu-nat.c: Likewise. * hppa-linux-nat.c: Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. * hppabsd-nat.c: Replace PIDGET with ptid_get_pid. * hppanbsd-nat.c: Likewise. * i386-linux-nat.c: Replace PIDGET with ptid_get_pid. Replace TIDGET with ptid_get_lwp. * i386bsd-nat.c: Replace PIDGET with ptid_get_pid. * ia64-linux-nat.c: Replace PIDGET with ptid_get_pid. * infcmd.c: Likewise. * inferior.h: Likewise. * inflow.c: Likewise. * infrun.c: Likewise. * linux-fork.c: Likewise. * linux-nat.c: Replace PIDGET with ptid_get_pid. Replace GET_PID with ptid_get_pid. Replace is_lwp with ptid_lwp_p. Replace GET_LWP with ptid_get_lwp. Replace BUILD_LWP with ptid_build. --- gdb/common/ptid.c | 29 ++++++++++++++++++++++++++--- gdb/common/ptid.h | 9 +++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) (limited to 'gdb/common') diff --git a/gdb/common/ptid.c b/gdb/common/ptid.c index 506b5c2bef6..e8d25c02d18 100644 --- a/gdb/common/ptid.c +++ b/gdb/common/ptid.c @@ -83,10 +83,33 @@ ptid_equal (ptid_t ptid1, ptid_t ptid2) int ptid_is_pid (ptid_t ptid) { - if (ptid_equal (minus_one_ptid, ptid)) - return 0; - if (ptid_equal (null_ptid, ptid)) + if (ptid_equal (minus_one_ptid, ptid) + || ptid_equal (null_ptid, ptid)) return 0; return (ptid_get_lwp (ptid) == 0 && ptid_get_tid (ptid) == 0); } + +/* Returns true if PTID represents a lwp. */ + +int +ptid_lwp_p (ptid_t ptid) +{ + if (ptid_equal (minus_one_ptid, ptid) + || ptid_equal (null_ptid, ptid)) + return 0; + + return (ptid_get_lwp (ptid) != 0); +} + +/* Returns true if PTID represents a tid. */ + +int +ptid_tid_p (ptid_t ptid) +{ + if (ptid_equal (minus_one_ptid, ptid) + || ptid_equal (null_ptid, ptid)) + return 0; + + return (ptid_get_tid (ptid) != 0); +} diff --git a/gdb/common/ptid.h b/gdb/common/ptid.h index fefe8b6517a..1326506cb36 100644 --- a/gdb/common/ptid.h +++ b/gdb/common/ptid.h @@ -33,6 +33,9 @@ ptid_get_lwp - Fetch the lwp component of a ptid. ptid_get_tid - Fetch the tid component of a ptid. ptid_equal - Test to see if two ptids are equal. + ptid_is_pid - Test if a ptid is of the form (pid, 0, 0). + ptid_lwp_p - Test if a ptid's lwp component is non-zero. + ptid_tid_p - Test if a ptid's tid component is non-zero. Please do NOT access the struct ptid members directly (except, of course, in the implementation of the above ptid manipulation @@ -82,4 +85,10 @@ int ptid_equal (ptid_t p1, ptid_t p2); /* Return true if PTID represents a process id. */ int ptid_is_pid (ptid_t ptid); +/* Return true if PTID's lwp member is non-zero. */ +int ptid_lwp_p (ptid_t ptid); + +/* Return true if PTID's tid member is non-zero. */ +int ptid_tid_p (ptid_t ptid); + #endif -- cgit v1.2.1