Remove ioctl-based procfs support on Solaris

This is the previously mentioned patch to get rid of
unstructured/ioctl-based procfs support in procfs.c.  Given that support
for structured procfs was introduced in Solaris 2.6 back in 1997 and
we're just removing support for Solaris < 10, there's no point in
carrying that baggage (and tons of support for IRIX and OSF/1 as well)
around any longer.

Most of the patch should be straightforward (removing support for
!NEW_PROC_API, non-Solaris OSes and pre-Solaris 10 quirks).

Only a few points need explanations:

* <sys/syscall.h> was already included unconditionally in most places,
  so there's no need to have guards in a few remaining ones.

* configure.host already obsoletes i?86-*-sysv4.2, i?86-*-sysv5, so
  NEW_PROC_API detection for those in configure.ac can go.

* I'm still including <sys/procfs.h> with #define _STRUCTURED_PROC 1.
  Theoretically, it would be better to include <procfs.h> on Solaris
  (which includes that define), but that breaks the build over
  <procfs.h> vs. gdb's "procfs.h", and doesn't exist on Linux.

* I've regenerated syscall_table[] in proc-events.c with a small script
  from Solaris 10, 11.3, 11.4 <sys/syscall.h>, so there should be no
  traces of older Solaris versions and other OSes left.

* prsysent_t and DYNAMIC_SYSCALLS was only used for AIX 5, but AIX
  doesn't use procfs.c any longer, so all related code can go.

The patch was generated with diff -w so one can easier see changes
without being distracted by simple reindentations.

So far, it has only been compiled and smoke-tested on
amd64-pc-solaris2.1[01], sparcv9-sun-solaris2.1[01], and
x86_64-pc-linux-gnu.  Certainly needs more testing (Solaris 11.3
vs. 11.4, 32-bit gdb, testsuite once I've figured out what's wrong on
Solaris 10 etc.), but it's enough to get a first impression how much
cleanup is possible here.

	* configure.ac Don't check for sys/fault.h, sys/syscall.h,
	sys/proc.h.
	(NEW_PROC_API): Remove.
	(prsysent_t, pr_sigset_t, pr_sigaction64_t, pr_siginfo64_t):
	Likewise.
	* common/common.m4 (GDB_AC_COMMON): Don't check for sys/syscall.h.
	* configure: Regenerate.
	* config.in: Regenerate.
	* gdbserver/configure: Regenerate.
	* gdbserver/config.in: Regenerate.

	* i386-sol2-nat.c (_initialize_amd64_sol2_nat): Remove
	NEW_PROC_API test.
	* sparc-sol2-nat.c (_initialize_sparc_sol2_nat): Likewise.

	* linux-btrace.c: Remove HAVE_SYS_SYSCALL_H test.

	* proc-api.c: Remove !NEW_PROC_API support.
	Remove HAVE_SYS_PROC_H and HAVE_SYS_USER_H tests.
	Remove tests for macros always defined on Solaris.
	* proc-events.c: Remove !NEW_PROC_API support.
	Remove Remove HAVE_SYS_SYSCALL_H, HAVE_SYS_PROC_H and
	HAVE_SYS_USER_H tests.
	(init_syscall_table): Remove non-Solaris syscalls.
	Remove tests for syscalls present on all Solaris versions.
	Add missing Solaris 10+ syscalls.
	(signal_table): Remove non-Solaris signals.
	Remove tests for signals present on all Solaris versions.
	(fault_table): Remove non-Solaris faults.
	Remove tests for faults present on all Solaris versions.
	* proc-flags.c: Remove !NEW_PROC_API support.
	(pr_flag_table): Remove non-Solaris and pre-Solaris 7 comments.
	Remove non-Solaris flags.
	* proc-why.c: Remove !NEW_PROC_API support.
	(pr_why_table): Remove meaningless comments.
	Remove tests for reasons present on all Solaris versions.
	Remove OSF/1 cases.
	(proc_prettyfprint_why): Likewise.

	* procfs.c: Remove !NEW_PROC_API and DYNAMIC_SYSCALLS support.
	Remove HAVE_SYS_FAULT_H and HAVE_SYS_SYSCALL_H tests.
	Remove WA_READ test, IRIX watchpoint support.
	(gdb_sigset_t, gdb_sigaction_t, gdb_siginfo_t): Replace by base
	types.  Change users.
	(gdb_praddset, gdb_prdelset, gdb_premptysysset, gdb_praddsysset)
	(gdb_prdelset, gdb_pr_issyssetmember): Replace by base macros.
	Change callers.
	Remove CTL_PROC_NAME_FMT tests.
	(gdb_prstatus_t, gdb_lwpstatus_t): Replace by base types.  Change
	users.
	(sysset_t_size): Remove.  Use sizeof (sysset_t) in callers.
	Remove PROCFS_DONT_PIOCSSIG_CURSIG support.
	(proc_modify_flag): Replace GDBRESET by PCUNSET.
	Remove PR_ASYNC, PR_KLC tests.
	(proc_unset_inherit_on_fork): Remove PR_ASYNC test.
	(proc_parent_pid): Remove PCWATCH etc. tests.
	(proc_set_watchpoint): Remove !PCWATCH && !PIOCSWATCH support.
	Remove PCAGENT test.
	(proc_get_nthreads) [PIOCNTHR && PIOCTLIST]: Remove.
	Remove SYS_lwpcreate || SYS_lwp_create test.
	(proc_get_current_thread): Likewise.
	[PIOCNTHR && PIOCTLIST]: Remove.
	[PIOCLSTATUS]: Remove.
	(procfs_debug_inferior): Remove non-Solaris cases, conditionals.
	[PRFS_STOPEXEC]: Remove.
	(syscall_is_lwp_exit): Remove non-Solaris cases, conditionals.
	(syscall_is_exit): Likewise.
	(syscall_is_exec): Likewise.
	(syscall_is_lwp_create): Likewise.
	Remove SYS_syssgi support.
	(procfs_wait): Remove PR_ASYNC, !PIOCSSPCACT tests.
	[SYS_syssgi]: Remove.
	Remove non-Solaris cases, conditionals.
	(unconditionally_kill_inferior) [PROCFS_NEED_PIOCSSIG_FOR_KILL]:
	Remove.
	(procfs_init_inferior) [SYS_syssgi]: Remove.
	(procfs_set_exec_trap) [PRFS_STOPEXEC]: Remove.
	(procfs_inferior_created) [SYS_syssgi]: Remove.
	(procfs_set_watchpoint): Remove !AIX5 test.
	(procfs_stopped_by_watchpoint): Remove FLTWATCH test, FLTKWATCH
	case.
	(mappingflags) [MA_PHYS]: Remove.
	(info_mappings_callback): Remove PCAGENT test.
	Remove PIOCOPENLWP || PCAGENT test.
This commit is contained in:
Rainer Orth
2017-11-30 16:05:30 +01:00
parent 7ac2002247
commit 44122162ae
16 changed files with 442 additions and 3649 deletions

View File

@ -1,3 +1,90 @@
2017-11-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac Don't check for sys/fault.h, sys/syscall.h,
sys/proc.h.
(NEW_PROC_API): Remove.
(prsysent_t, pr_sigset_t, pr_sigaction64_t, pr_siginfo64_t):
Likewise.
* common/common.m4 (GDB_AC_COMMON): Don't check for sys/syscall.h.
* configure: Regenerate.
* config.in: Regenerate.
* gdbserver/configure: Regenerate.
* gdbserver/config.in: Regenerate.
* i386-sol2-nat.c (_initialize_amd64_sol2_nat): Remove
NEW_PROC_API test.
* sparc-sol2-nat.c (_initialize_sparc_sol2_nat): Likewise.
* linux-btrace.c: Remove HAVE_SYS_SYSCALL_H test.
* proc-api.c: Remove !NEW_PROC_API support.
Remove HAVE_SYS_PROC_H and HAVE_SYS_USER_H tests.
Remove tests for macros always defined on Solaris.
* proc-events.c: Remove !NEW_PROC_API support.
Remove Remove HAVE_SYS_SYSCALL_H, HAVE_SYS_PROC_H and
HAVE_SYS_USER_H tests.
(init_syscall_table): Remove non-Solaris syscalls.
Remove tests for syscalls present on all Solaris versions.
Add missing Solaris 10+ syscalls.
(signal_table): Remove non-Solaris signals.
Remove tests for signals present on all Solaris versions.
(fault_table): Remove non-Solaris faults.
Remove tests for faults present on all Solaris versions.
* proc-flags.c: Remove !NEW_PROC_API support.
(pr_flag_table): Remove non-Solaris and pre-Solaris 7 comments.
Remove non-Solaris flags.
* proc-why.c: Remove !NEW_PROC_API support.
(pr_why_table): Remove meaningless comments.
Remove tests for reasons present on all Solaris versions.
Remove OSF/1 cases.
(proc_prettyfprint_why): Likewise.
* procfs.c: Remove !NEW_PROC_API and DYNAMIC_SYSCALLS support.
Remove HAVE_SYS_FAULT_H and HAVE_SYS_SYSCALL_H tests.
Remove WA_READ test, IRIX watchpoint support.
(gdb_sigset_t, gdb_sigaction_t, gdb_siginfo_t): Replace by base
types. Change users.
(gdb_praddset, gdb_prdelset, gdb_premptysysset, gdb_praddsysset)
(gdb_prdelset, gdb_pr_issyssetmember): Replace by base macros.
Change callers.
Remove CTL_PROC_NAME_FMT tests.
(gdb_prstatus_t, gdb_lwpstatus_t): Replace by base types. Change
users.
(sysset_t_size): Remove. Use sizeof (sysset_t) in callers.
Remove PROCFS_DONT_PIOCSSIG_CURSIG support.
(proc_modify_flag): Replace GDBRESET by PCUNSET.
Remove PR_ASYNC, PR_KLC tests.
(proc_unset_inherit_on_fork): Remove PR_ASYNC test.
(proc_parent_pid): Remove PCWATCH etc. tests.
(proc_set_watchpoint): Remove !PCWATCH && !PIOCSWATCH support.
Remove PCAGENT test.
(proc_get_nthreads) [PIOCNTHR && PIOCTLIST]: Remove.
Remove SYS_lwpcreate || SYS_lwp_create test.
(proc_get_current_thread): Likewise.
[PIOCNTHR && PIOCTLIST]: Remove.
[PIOCLSTATUS]: Remove.
(procfs_debug_inferior): Remove non-Solaris cases, conditionals.
[PRFS_STOPEXEC]: Remove.
(syscall_is_lwp_exit): Remove non-Solaris cases, conditionals.
(syscall_is_exit): Likewise.
(syscall_is_exec): Likewise.
(syscall_is_lwp_create): Likewise.
Remove SYS_syssgi support.
(procfs_wait): Remove PR_ASYNC, !PIOCSSPCACT tests.
[SYS_syssgi]: Remove.
Remove non-Solaris cases, conditionals.
(unconditionally_kill_inferior) [PROCFS_NEED_PIOCSSIG_FOR_KILL]:
Remove.
(procfs_init_inferior) [SYS_syssgi]: Remove.
(procfs_set_exec_trap) [PRFS_STOPEXEC]: Remove.
(procfs_inferior_created) [SYS_syssgi]: Remove.
(procfs_set_watchpoint): Remove !AIX5 test.
(procfs_stopped_by_watchpoint): Remove FLTWATCH test, FLTKWATCH
case.
(mappingflags) [MA_PHYS]: Remove.
(info_mappings_callback): Remove PCAGENT test.
Remove PIOCOPENLWP || PCAGENT test.
2017-11-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* sol-thread.c (info_solthreads): Constify args.

30
gdb/aclocal.m4 vendored
View File

@ -1,7 +1,8 @@
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -13,12 +14,14 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@ -100,12 +103,15 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@ -124,8 +130,8 @@ AC_SUBST(install_sh)])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -145,7 +151,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
@ -161,12 +167,14 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@ -189,13 +197,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 2
# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@ -204,7 +212,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

View File

@ -26,7 +26,7 @@ AC_DEFUN([GDB_AC_COMMON], [
AM_LANGINFO_CODESET
AC_CHECK_HEADERS(linux/perf_event.h locale.h memory.h signal.h dnl
sys/resource.h sys/socket.h sys/syscall.h dnl
sys/resource.h sys/socket.h dnl
sys/un.h sys/wait.h dnl
thread_db.h wait.h dnl
termios.h)

View File

@ -348,18 +348,6 @@
/* Define to 1 if you have the <proc_service.h> header file. */
#undef HAVE_PROC_SERVICE_H
/* Define if <sys/procfs.h> has prsysent_t. */
#undef HAVE_PRSYSENT_T
/* Define if <sys/procfs.h> has pr_sigaction64_t. */
#undef HAVE_PR_SIGACTION64_T
/* Define if <sys/procfs.h> has pr_siginfo64_t. */
#undef HAVE_PR_SIGINFO64_T
/* Define if <sys/procfs.h> has pr_sigset_t. */
#undef HAVE_PR_SIGSET_T
/* Define if <sys/procfs.h> has psaddr_t. */
#undef HAVE_PSADDR_T
@ -495,9 +483,6 @@
/* Define to 1 if you have the <sys/debugreg.h> header file. */
#undef HAVE_SYS_DEBUGREG_H
/* Define to 1 if you have the <sys/fault.h> header file. */
#undef HAVE_SYS_FAULT_H
/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
@ -516,9 +501,6 @@
/* Define to 1 if you have the <sys/procfs.h> header file. */
#undef HAVE_SYS_PROCFS_H
/* Define to 1 if you have the <sys/proc.h> header file. */
#undef HAVE_SYS_PROC_H
/* Define to 1 if you have the <sys/ptrace.h> header file. */
#undef HAVE_SYS_PTRACE_H
@ -537,9 +519,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/syscall.h> header file. */
#undef HAVE_SYS_SYSCALL_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@ -619,9 +598,6 @@
moved. */
#undef JIT_READER_DIR_RELOCATABLE
/* Define if you want to use new multi-fd /proc interface. */
#undef NEW_PROC_API
/* Name of this package. */
#undef PACKAGE

187
gdb/configure vendored
View File

@ -12041,10 +12041,9 @@ fi
# elf_hp.h is for HP/UX 64-bit shared library support.
for ac_header in nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
thread_db.h \
sys/fault.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \
sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \
sys/reg.h sys/debugreg.h sys/select.h \
termios.h elf_hp.h \
dlfcn.h
do :
@ -12060,22 +12059,6 @@ fi
done
for ac_header in sys/proc.h
do :
ac_fn_c_check_header_compile "$LINENO" "sys/proc.h" "ac_cv_header_sys_proc_h" "#if HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
"
if test "x$ac_cv_header_sys_proc_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_PROC_H 1
_ACEOF
fi
done
for ac_header in sys/user.h
do :
ac_fn_c_check_header_compile "$LINENO" "sys/user.h" "ac_cv_header_sys_user_h" "#if HAVE_SYS_PARAM_H
@ -13559,7 +13542,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/syscall.h sys/un.h sys/wait.h thread_db.h wait.h termios.h
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@ -14275,23 +14258,6 @@ _ACEOF
fi
# Detect which type of /proc is in use, such as for Solaris.
if test "${target}" = "${host}"; then
case "${host}" in
*-*-sysv4.2* | *-*-sysv5* )
$as_echo "#define NEW_PROC_API 1" >>confdefs.h
;;
*-*-solaris2.[6789] | *-*-solaris2.1[0-9]*)
$as_echo "#define NEW_PROC_API 1" >>confdefs.h
;;
esac
fi
if test "$ac_cv_header_sys_procfs_h" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gregset_t in sys/procfs.h" >&5
$as_echo_n "checking for gregset_t in sys/procfs.h... " >&6; }
@ -14552,155 +14518,6 @@ $as_echo "#define HAVE_PSADDR_T 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_psaddr_t" >&5
$as_echo "$bfd_cv_have_sys_procfs_type_psaddr_t" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prsysent_t in sys/procfs.h" >&5
$as_echo_n "checking for prsysent_t in sys/procfs.h... " >&6; }
if test "${bfd_cv_have_sys_procfs_type_prsysent_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _SYSCALL32
/* Needed for new procfs interface on sparc-solaris. */
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
int
main ()
{
prsysent_t avar
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
bfd_cv_have_sys_procfs_type_prsysent_t=yes
else
bfd_cv_have_sys_procfs_type_prsysent_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $bfd_cv_have_sys_procfs_type_prsysent_t = yes; then
$as_echo "#define HAVE_PRSYSENT_T 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prsysent_t" >&5
$as_echo "$bfd_cv_have_sys_procfs_type_prsysent_t" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_sigset_t in sys/procfs.h" >&5
$as_echo_n "checking for pr_sigset_t in sys/procfs.h... " >&6; }
if test "${bfd_cv_have_sys_procfs_type_pr_sigset_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _SYSCALL32
/* Needed for new procfs interface on sparc-solaris. */
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
int
main ()
{
pr_sigset_t avar
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
else
bfd_cv_have_sys_procfs_type_pr_sigset_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $bfd_cv_have_sys_procfs_type_pr_sigset_t = yes; then
$as_echo "#define HAVE_PR_SIGSET_T 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_sigset_t" >&5
$as_echo "$bfd_cv_have_sys_procfs_type_pr_sigset_t" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_sigaction64_t in sys/procfs.h" >&5
$as_echo_n "checking for pr_sigaction64_t in sys/procfs.h... " >&6; }
if test "${bfd_cv_have_sys_procfs_type_pr_sigaction64_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _SYSCALL32
/* Needed for new procfs interface on sparc-solaris. */
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
int
main ()
{
pr_sigaction64_t avar
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
else
bfd_cv_have_sys_procfs_type_pr_sigaction64_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $bfd_cv_have_sys_procfs_type_pr_sigaction64_t = yes; then
$as_echo "#define HAVE_PR_SIGACTION64_T 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&5
$as_echo "$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_siginfo64_t in sys/procfs.h" >&5
$as_echo_n "checking for pr_siginfo64_t in sys/procfs.h... " >&6; }
if test "${bfd_cv_have_sys_procfs_type_pr_siginfo64_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _SYSCALL32
/* Needed for new procfs interface on sparc-solaris. */
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
int
main ()
{
pr_siginfo64_t avar
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
else
bfd_cv_have_sys_procfs_type_pr_siginfo64_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $bfd_cv_have_sys_procfs_type_pr_siginfo64_t = yes; then
$as_echo "#define HAVE_PR_SIGINFO64_T 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&5
$as_echo "$bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&6; }

View File

@ -1305,17 +1305,11 @@ AC_HEADER_STDC
# elf_hp.h is for HP/UX 64-bit shared library support.
AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
thread_db.h \
sys/fault.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \
sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \
sys/reg.h sys/debugreg.h sys/select.h \
termios.h elf_hp.h \
dlfcn.h])
AC_CHECK_HEADERS(sys/proc.h, [], [],
[#if HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
])
AC_CHECK_HEADERS(sys/user.h, [], [],
[#if HAVE_SYS_PARAM_H
# include <sys/param.h>
@ -1533,21 +1527,6 @@ AC_CHECK_MEMBERS([struct ptrace_lwpinfo.pl_tdname], [], [],
AC_CHECK_MEMBERS([struct ptrace_lwpinfo.pl_syscall_code], [], [],
[#include <sys/ptrace.h>])
# Detect which type of /proc is in use, such as for Solaris.
if test "${target}" = "${host}"; then
case "${host}" in
*-*-sysv4.2* | *-*-sysv5* )
AC_DEFINE(NEW_PROC_API, 1,
[Define if you want to use new multi-fd /proc interface.])
;;
*-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]*)
AC_DEFINE(NEW_PROC_API, 1,
[Define if you want to use new multi-fd /proc interface.])
;;
esac
fi
if test "$ac_cv_header_sys_procfs_h" = yes; then
BFD_HAVE_SYS_PROCFS_TYPE(gregset_t)
BFD_HAVE_SYS_PROCFS_TYPE(fpregset_t)
@ -1556,11 +1535,6 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then
BFD_HAVE_SYS_PROCFS_TYPE(prgregset32_t)
BFD_HAVE_SYS_PROCFS_TYPE(lwpid_t)
BFD_HAVE_SYS_PROCFS_TYPE(psaddr_t)
BFD_HAVE_SYS_PROCFS_TYPE(prsysent_t)
BFD_HAVE_SYS_PROCFS_TYPE(pr_sigset_t)
BFD_HAVE_SYS_PROCFS_TYPE(pr_sigaction64_t)
BFD_HAVE_SYS_PROCFS_TYPE(pr_siginfo64_t)
dnl Check for broken prfpregset_t type

View File

@ -271,9 +271,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/syscall.h> header file. */
#undef HAVE_SYS_SYSCALL_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

View File

@ -6769,7 +6769,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/syscall.h sys/un.h sys/wait.h thread_db.h wait.h termios.h
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

View File

@ -138,9 +138,7 @@ _initialize_amd64_sol2_nat (void)
/* Fill in the generic procfs methods. */
t = procfs_target ();
#ifdef NEW_PROC_API /* Solaris 6 and above can do HW watchpoints. */
procfs_use_watchpoints (t);
#endif
#if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)
amd64_native_gregset32_reg_offset = amd64_sol2_gregset32_reg_offset;

View File

@ -28,9 +28,7 @@
#include <inttypes.h>
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
#if HAVE_LINUX_PERF_EVENT_H && defined(SYS_perf_event_open)
#include <unistd.h>

View File

@ -1,4 +1,4 @@
/* Machine independent support for SVR4 /proc (process file system) for GDB.
/* Machine independent support for Solaris /proc (process file system) for GDB.
Copyright (C) 1999-2017 Free Software Foundation, Inc.
@ -22,26 +22,18 @@
/*
* Pretty-print trace of api calls to the /proc api
* (ioctl or read/write calls).
*
*/
#include "defs.h"
#include "gdbcmd.h"
#include "completer.h"
#if defined (NEW_PROC_API)
#define _STRUCTURED_PROC 1
#endif
#include <sys/types.h>
#include <sys/procfs.h>
#ifdef HAVE_SYS_PROC_H
#include <sys/proc.h> /* for struct proc */
#endif
#ifdef HAVE_SYS_USER_H
#include <sys/user.h> /* for struct user */
#endif
#include <fcntl.h> /* for O_RDWR etc. */
#include "gdb_wait.h"
@ -91,361 +83,34 @@ set_procfs_file_cmd (const char *args,
procfs_file = NULL;
}
#ifndef NEW_PROC_API
static struct trans ioctl_table[] = {
#ifdef PIOCACINFO /* irix */
{ PIOCACINFO, "PIOCACINFO", "get process account info" },
#endif
{ PIOCACTION, "PIOCACTION", "get signal action structs" },
#ifdef PIOCARGUMENTS /* osf */
{ PIOCARGUMENTS, "PIOCARGUMENTS", "command line args" },
#endif
#ifdef PIOCAUXV /* solaris aux vectors */
{ PIOCAUXV, "PIOCAUXV", "get aux vector" },
{ PIOCNAUXV, "PIOCNAUXV", "get number of aux vector entries" },
#endif /* AUXV */
{ PIOCCFAULT, "PIOCCFAULT", "clear current fault" },
{ PIOCCRED, "PIOCCRED", "get process credentials" },
#ifdef PIOCENEVCTRS /* irix event counters */
{ PIOCENEVCTRS, "PIOCENEVCTRS", "acquire and start event counters" },
{ PIOCGETEVCTRL, "PIOCGETEVCTRL", "get control info of event counters" },
{ PIOCGETEVCTRS, "PIOCGETEVCTRS", "dump event counters" },
{ PIOCGETPREVCTRS, "PIOCGETPREVCTRS", "dump event counters & prusage info" },
{ PIOCRELEVCTRS, "PIOCRELEVCTRS", "release/stop event counters" },
{ PIOCSETEVCTRL, "PIOCSETEVCTRL", "set control info of event counters" },
{ PIOCGETPTIMER, "PIOCGETPTIMER", "get process timers" },
#endif /* irix event counters */
{ PIOCGENTRY, "PIOCGENTRY", "get traced syscall entry set" },
#if defined (PIOCGETPR)
{ PIOCGETPR, "PIOCGETPR", "read struct proc" },
#endif
#if defined (PIOCGETU)
{ PIOCGETU, "PIOCGETU", "read user area" },
#endif
#if defined (PIOCGETUTK) && (defined(KERNEL) || defined(SHOW_UTT)) /* osf */
{ PIOCGETUTK, "PIOCGETUTK", "get the utask struct" },
#endif
{ PIOCGEXIT, "PIOCGEXIT", "get traced syscall exit set" },
{ PIOCGFAULT, "PIOCGFAULT", "get traced fault set" },
#ifdef PIOCGFPCR /* osf */
{ PIOCGFPCR, "PIOCGFPCR", "get FP control register" },
{ PIOCSFPCR, "PIOCSFPCR", "set FP conrtol register" },
#endif
{ PIOCGFPREG, "PIOCGFPREG", "get floating point registers" },
{ PIOCGHOLD, "PIOCGHOLD", "get held signal set" },
{ PIOCGREG, "PIOCGREG", "get general registers" },
{ PIOCGROUPS, "PIOCGROUPS", "get supplementary groups" },
#ifdef PIOCGSPCACT /* osf */
{ PIOCGSPCACT, "PIOCGSPCACT", "get special action" },
{ PIOCSSPCACT, "PIOCSSPCACT", "set special action" },
#endif
{ PIOCGTRACE, "PIOCGTRACE", "get traced signal set" },
#ifdef PIOCGWATCH /* irix watchpoints */
{ PIOCGWATCH, "PIOCGWATCH", "get watchpoint" },
{ PIOCSWATCH, "PIOCSWATCH", "set watchpoint" },
{ PIOCNWATCH, "PIOCNWATCH", "get number of watchpoints" },
#endif /* irix watchpoints */
#ifdef PIOCGWIN /* solaris sparc */
{ PIOCGWIN, "PIOCGWIN", "get gwindows_t" },
#endif
#ifdef PIOCGXREG /* solaris sparc extra regs */
{ PIOCGXREGSIZE, "PIOCXREGSIZE", "get extra register state size" },
{ PIOCGXREG, "PIOCGXREG", "get extra register state" },
{ PIOCSXREG, "PIOCSXREG", "set extra register state" },
#endif /* XREG */
{ PIOCKILL, "PIOCKILL", "send signal" },
#ifdef PIOCLDT /* solaris i386 */
{ PIOCLDT, "PIOCLDT", "get LDT" },
{ PIOCNLDT, "PIOCNLDT", "get number of LDT entries" },
#endif
#ifdef PIOCLSTATUS /* solaris */
{ PIOCLSTATUS, "PIOCLSTATUS", "get status of all lwps" },
{ PIOCLUSAGE, "PIOCLUSAGE", "get resource usage of all lwps" },
{ PIOCOPENLWP, "PIOCOPENLWP", "get lwp file descriptor" },
{ PIOCLWPIDS, "PIOCLWPIDS", "get lwp identifiers" },
#endif /* LWP */
{ PIOCMAP, "PIOCMAP", "get memory map information" },
{ PIOCMAXSIG, "PIOCMAXSIG", "get max signal number" },
{ PIOCNICE, "PIOCNICE", "set nice priority" },
{ PIOCNMAP, "PIOCNMAP", "get number of memory mappings" },
{ PIOCOPENM, "PIOCOPENM", "open mapped object for reading" },
#ifdef PIOCOPENMOBS /* osf */
{ PIOCOPENMOBS, "PIOCOPENMOBS", "open mapped object" },
#endif
#ifdef PIOCOPENPD /* solaris */
{ PIOCOPENPD, "PIOCOPENPD", "get page data file descriptor" },
#endif
{ PIOCPSINFO, "PIOCPSINFO", "get ps(1) information" },
{ PIOCRESET, "PIOCRESET", "reset process flags" },
{ PIOCRFORK, "PIOCRFORK", "reset inherit-on-fork flag" },
{ PIOCRRLC, "PIOCRRLC", "reset run-on-last-close flag" },
{ PIOCRUN, "PIOCRUN", "make process runnable" },
#ifdef PIOCSAVECCNTRS /* irix */
{ PIOCSAVECCNTRS, "PIOCSAVECCNTRS", "parent gets child cntrs" },
#endif
{ PIOCSENTRY, "PIOCSENTRY", "set traced syscall entry set" },
{ PIOCSET, "PIOCSET", "set process flags" },
{ PIOCSEXIT, "PIOCSEXIT", "set traced syscall exit set" },
{ PIOCSFAULT, "PIOCSFAULT", "set traced fault set" },
{ PIOCSFORK, "PIOCSFORK", "set inherit-on-fork flag" },
{ PIOCSFPREG, "PIOCSFPREG", "set floating point registers" },
{ PIOCSHOLD, "PIOCSHOLD", "set held signal set" },
{ PIOCSREG, "PIOCSREG", "set general registers" },
{ PIOCSRLC, "PIOCSRLC", "set run-on-last-close flag" },
{ PIOCSSIG, "PIOCSSIG", "set current signal" },
{ PIOCSTATUS, "PIOCSTATUS", "get process status" },
{ PIOCSTOP, "PIOCSTOP", "post stop request" },
{ PIOCSTRACE, "PIOCSTRACE", "set traced signal set" },
{ PIOCUNKILL, "PIOCUNKILL", "delete a signal" },
#ifdef PIOCUSAGE /* solaris */
{ PIOCUSAGE, "PIOCUSAGE", "get resource usage" },
#endif
{ PIOCWSTOP, "PIOCWSTOP", "wait for process to stop" },
#ifdef PIOCNTHR /* osf threads */
{ PIOCNTHR, "PIOCNTHR", "get thread count" },
{ PIOCRTINH, "PIOCRTINH", "reset inherit-on-thread-creation" },
{ PIOCSTINH, "PIOCSTINH", "set inherit-on-thread-creation" },
{ PIOCTLIST, "PIOCTLIST", "get thread ids" },
{ PIOCXPTH, "PIOCXPTH", "translate port to thread handle" },
{ PIOCTRUN, "PIOCTRUN", "make thread runnable" },
{ PIOCTSTATUS, "PIOCTSTATUS", "get thread status" },
{ PIOCTSTOP, "PIOCTSTOP", "stop a thread" },
/* ... TGTRACE TSTRACE TSSIG TKILL TUNKILL TCFAULT TGFAULT TSFAULT
TGFPREG TSFPREG TGREG TSREG TACTION TTERM TABRUN TGENTRY TSENTRY
TGEXIT TSEXIT TSHOLD ... thread functions */
#endif /* osf threads */
{ -1, NULL, NULL }
};
int
ioctl_with_trace (int fd, long opcode, void *ptr, char *file, int line)
{
int i = 0;
int ret;
int arg1;
prepare_to_trace ();
if (procfs_trace)
{
for (i = 0; ioctl_table[i].name != NULL; i++)
if (ioctl_table[i].value == opcode)
break;
if (info_verbose)
fprintf (procfs_file ? procfs_file : stdout,
"%s:%d -- ", file, line);
switch (opcode) {
case PIOCSET:
arg1 = ptr ? *(long *) ptr : 0;
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCSET, %s) %s\n",
arg1 == PR_FORK ? "PR_FORK" :
arg1 == PR_RLC ? "PR_RLC" :
#ifdef PR_ASYNC
arg1 == PR_ASYNC ? "PR_ASYNC" :
#endif
"<unknown flag>",
info_verbose ? ioctl_table[i].desc : "");
break;
case PIOCRESET:
arg1 = ptr ? *(long *) ptr : 0;
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCRESET, %s) %s\n",
arg1 == PR_FORK ? "PR_FORK" :
arg1 == PR_RLC ? "PR_RLC" :
#ifdef PR_ASYNC
arg1 == PR_ASYNC ? "PR_ASYNC" :
#endif
"<unknown flag>",
info_verbose ? ioctl_table[i].desc : "");
break;
case PIOCSTRACE:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCSTRACE) ");
proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
(sigset_t *) ptr, 0);
break;
case PIOCSFAULT:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (%s) ",
opcode == PIOCSFAULT ? "PIOCSFAULT" : "PIOCGFAULT");
proc_prettyfprint_faultset (procfs_file ? procfs_file : stdout,
(fltset_t *) ptr, 0);
break;
case PIOCSENTRY:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (%s) ",
opcode == PIOCSENTRY ? "PIOCSENTRY" : "PIOCGENTRY");
proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
(sysset_t *) ptr, 0);
break;
case PIOCSEXIT:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (%s) ",
opcode == PIOCSEXIT ? "PIOCSEXIT" : "PIOCGEXIT");
proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
(sysset_t *) ptr, 0);
break;
case PIOCSHOLD:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (%s) ",
opcode == PIOCSHOLD ? "PIOCSHOLD" : "PIOCGHOLD");
proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
(sigset_t *) ptr, 0);
break;
case PIOCSSIG:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCSSIG) ");
proc_prettyfprint_signal (procfs_file ? procfs_file : stdout,
ptr ? ((siginfo_t *) ptr)->si_signo : 0,
0);
fprintf (procfs_file ? procfs_file : stdout, "\n");
break;
case PIOCRUN:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCRUN) ");
arg1 = ptr ? *(long *) ptr : 0;
if (arg1 & PRCSIG)
fprintf (procfs_file ? procfs_file : stdout, "clearSig ");
if (arg1 & PRCFAULT)
fprintf (procfs_file ? procfs_file : stdout, "clearFlt ");
if (arg1 & PRSTRACE)
fprintf (procfs_file ? procfs_file : stdout, "setTrace ");
if (arg1 & PRSHOLD)
fprintf (procfs_file ? procfs_file : stdout, "setHold ");
if (arg1 & PRSFAULT)
fprintf (procfs_file ? procfs_file : stdout, "setFlt ");
if (arg1 & PRSVADDR)
fprintf (procfs_file ? procfs_file : stdout, "setVaddr ");
if (arg1 & PRSTEP)
fprintf (procfs_file ? procfs_file : stdout, "step ");
if (arg1 & PRSABORT)
fprintf (procfs_file ? procfs_file : stdout, "syscallAbort ");
if (arg1 & PRSTOP)
fprintf (procfs_file ? procfs_file : stdout, "stopReq ");
fprintf (procfs_file ? procfs_file : stdout, "\n");
break;
case PIOCKILL:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCKILL) ");
proc_prettyfprint_signal (procfs_file ? procfs_file : stdout,
ptr ? *(long *) ptr : 0, 0);
fprintf (procfs_file ? procfs_file : stdout, "\n");
break;
#ifdef PIOCSSPCACT
case PIOCSSPCACT:
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (PIOCSSPCACT) ");
arg1 = ptr ? *(long *) ptr : 0;
if (arg1 & PRFS_STOPFORK)
fprintf (procfs_file ? procfs_file : stdout, "stopFork ");
if (arg1 & PRFS_STOPEXEC)
fprintf (procfs_file ? procfs_file : stdout, "stopExec ");
if (arg1 & PRFS_STOPTERM)
fprintf (procfs_file ? procfs_file : stdout, "stopTerm ");
if (arg1 & PRFS_STOPTCR)
fprintf (procfs_file ? procfs_file : stdout, "stopThreadCreate ");
if (arg1 & PRFS_STOPTTERM)
fprintf (procfs_file ? procfs_file : stdout, "stopThreadTerm ");
if (arg1 & PRFS_KOLC)
fprintf (procfs_file ? procfs_file : stdout, "killOnLastClose ");
fprintf (procfs_file ? procfs_file : stdout, "\n");
break;
#endif /* PIOCSSPCACT */
default:
if (ioctl_table[i].name)
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (%s) %s\n",
ioctl_table[i].name,
info_verbose ? ioctl_table[i].desc : "");
else
fprintf (procfs_file ? procfs_file : stdout,
"ioctl (<unknown %ld (0x%lx)) \n", opcode, opcode);
break;
}
if (procfs_file)
fflush (procfs_file);
}
errno = 0;
ret = ioctl (fd, opcode, ptr);
if (procfs_trace && ret < 0)
{
fprintf (procfs_file ? procfs_file : stdout,
"[ioctl (%s) FAILED! (%s)]\n",
ioctl_table[i].name != NULL ?
ioctl_table[i].name : "<unknown>",
safe_strerror (errno));
if (procfs_file)
fflush (procfs_file);
}
return ret;
}
#else /* NEW_PROC_API */
static struct trans rw_table[] = {
#ifdef PCAGENT /* solaris */
{ PCAGENT, "PCAGENT", "create agent lwp with regs from argument" },
#endif
{ PCCFAULT, "PCCFAULT", "clear current fault" },
#ifdef PCCSIG /* solaris */
{ PCCSIG, "PCCSIG", "clear current signal" },
#endif
#ifdef PCDSTOP /* solaris */
{ PCDSTOP, "PCDSTOP", "post stop request" },
#endif
{ PCKILL, "PCKILL", "post a signal" },
#ifdef PCNICE /* solaris */
{ PCNICE, "PCNICE", "set nice priority" },
#endif
#ifdef PCREAD /* solaris */
{ PCREAD, "PCREAD", "read from the address space" },
{ PCWRITE, "PCWRITE", "write to the address space" },
#endif
{ PCRUN, "PCRUN", "make process/lwp runnable" },
#ifdef PCSASRS /* solaris 2.7 only */
{ PCSASRS, "PCSASRS", "set ancillary state registers" },
#endif
#ifdef PCSCRED /* solaris */
{ PCSCRED, "PCSCRED", "set process credentials" },
#endif
{ PCSENTRY, "PCSENTRY", "set traced syscall entry set" },
{ PCSET, "PCSET", "set modes" },
{ PCSEXIT, "PCSEXIT", "set traced syscall exit set" },
{ PCSFAULT, "PCSFAULT", "set traced fault set" },
{ PCSFPREG, "PCSFPREG", "set floating point registers" },
#ifdef PCSHOLD /* solaris */
{ PCSHOLD, "PCSHOLD", "set signal mask" },
#endif
{ PCSREG, "PCSREG", "set general registers" },
{ PCSSIG, "PCSSIG", "set current signal" },
{ PCSTOP, "PCSTOP", "post stop request and wait" },
{ PCSTRACE, "PCSTRACE", "set traced signal set" },
#ifdef PCSVADDR /* solaris */
{ PCSVADDR, "PCSVADDR", "set pc virtual address" },
#endif
#ifdef PCSXREG /* solaris sparc only */
{ PCSXREG, "PCSXREG", "set extra registers" },
#endif
#ifdef PCTWSTOP /* solaris */
{ PCTWSTOP, "PCTWSTOP", "wait for stop, with timeout arg" },
#endif
#ifdef PCUNKILL /* solaris */
{ PCUNKILL, "PCUNKILL", "delete a pending signal" },
#endif
#ifdef PCUNSET /* solaris */
{ PCUNSET, "PCUNSET", "unset modes" },
#endif
#ifdef PCWATCH /* solaris */
{ PCWATCH, "PCWATCH", "set/unset watched memory area" },
#endif
{ PCWSTOP, "PCWSTOP", "wait for process/lwp to stop, no timeout" },
{ 0, NULL, NULL }
};
@ -476,27 +141,16 @@ write_with_trace (int fd, void *varg, size_t len, char *file, int line)
"write (PCSET, %s) %s\n",
arg[1] == PR_FORK ? "PR_FORK" :
arg[1] == PR_RLC ? "PR_RLC" :
#ifdef PR_ASYNC
arg[1] == PR_ASYNC ? "PR_ASYNC" :
#endif
"<unknown flag>",
info_verbose ? rw_table[i].desc : "");
break;
#ifdef PCUNSET
case PCUNSET:
#endif
#ifdef PCRESET
#if PCRESET != PCUNSET
case PCRESET:
#endif
#endif
fprintf (procfs_file ? procfs_file : stdout,
"write (PCRESET, %s) %s\n",
arg[1] == PR_FORK ? "PR_FORK" :
arg[1] == PR_RLC ? "PR_RLC" :
#ifdef PR_ASYNC
arg[1] == PR_ASYNC ? "PR_ASYNC" :
#endif
"<unknown flag>",
info_verbose ? rw_table[i].desc : "");
break;
@ -524,14 +178,12 @@ write_with_trace (int fd, void *varg, size_t len, char *file, int line)
proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
(sysset_t *) &arg[1], 0);
break;
#ifdef PCSHOLD
case PCSHOLD:
fprintf (procfs_file ? procfs_file : stdout,
"write (PCSHOLD) ");
proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
(sigset_t *) &arg[1], 0);
break;
#endif
case PCSSIG:
fprintf (procfs_file ? procfs_file : stdout,
"write (PCSSIG) ");
@ -550,14 +202,10 @@ write_with_trace (int fd, void *varg, size_t len, char *file, int line)
fprintf (procfs_file ? procfs_file : stdout, "clearFlt ");
if (arg[1] & PRSTEP)
fprintf (procfs_file ? procfs_file : stdout, "step ");
#ifdef PRSABORT
if (arg[1] & PRSABORT)
fprintf (procfs_file ? procfs_file : stdout, "syscallAbort ");
#endif
#ifdef PRSTOP
if (arg[1] & PRSTOP)
fprintf (procfs_file ? procfs_file : stdout, "stopReq ");
#endif
fprintf (procfs_file ? procfs_file : stdout, "\n");
break;
@ -630,8 +278,6 @@ lseek_with_trace (int fd, off_t offset, int whence, char *file, int line)
return ret;
}
#endif /* NEW_PROC_API */
int
open_with_trace (char *filename, int mode, char *file, int line)
{

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
/* Machine independent support for SVR4 /proc (process file system) for GDB.
/* Machine independent support for Solaris /proc (process file system) for GDB.
Copyright (C) 1999-2017 Free Software Foundation, Inc.
Written by Michael Snyder at Cygnus Solutions.
Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
@ -27,9 +27,7 @@
#include "defs.h"
#if defined (NEW_PROC_API)
#define _STRUCTURED_PROC 1
#endif
#include <sys/types.h>
#include <sys/procfs.h>
@ -52,220 +50,44 @@ struct trans {
static struct trans pr_flag_table[] =
{
#if defined (PR_STOPPED)
/* Sol2.5: lwp is stopped
* Sol2.6: lwp is stopped
* Sol2.7: lwp is stopped
* IRIX6: process is stopped
* OSF: task/thread is stopped
* UW: LWP is stopped
*/
/* lwp is stopped */
{ PR_STOPPED, "PR_STOPPED", "Process (LWP) is stopped" },
#endif
#if defined (PR_ISTOP)
/* Sol2.5: lwp is stopped on an event of interest
* Sol2.6: lwp is stopped on an event of interest
* Sol2.7: lwp is stopped on an event of interest
* IRIX6: process is stopped on event of interest
* OSF: task/thread stopped on event of interest
* UW: LWP stopped on an event of interest
*/
/* lwp is stopped on an event of interest */
{ PR_ISTOP, "PR_ISTOP", "Stopped on an event of interest" },
#endif
#if defined (PR_DSTOP)
/* Sol2.5: lwp has a stop directive in effect
* Sol2.6: lwp has a stop directive in effect
* Sol2.7: lwp has a stop directive in effect
* IRIX6: process has stop directive in effect
* OSF: task/thread has stop directive in effect
* UW: A stop directive is in effect
*/
/* lwp has a stop directive in effect */
{ PR_DSTOP, "PR_DSTOP", "A stop directive is in effect" },
#endif
#if defined (PR_STEP)
/* Sol2.5: lwp has a single-step directive in effect
* Sol2.6: lwp has a single-step directive in effect
* Sol2.7: lwp has a single-step directive in effect
* IRIX6: process has single step pending
*/
/* lwp has a single-step directive in effect */
{ PR_STEP, "PR_STEP", "A single step directive is in effect" },
#endif
#if defined (PR_ASLEEP)
/* Sol2.5: lwp is sleeping in a system call
* Sol2.6: lwp is sleeping in a system call
* Sol2.7: lwp is sleeping in a system call
* IRIX6: process is in an interruptible sleep
* OSF: task/thread is asleep within a system call
* UW: LWP is sleep()ing in a system call
*/
/* lwp is sleeping in a system call */
{ PR_ASLEEP, "PR_ASLEEP", "Sleeping in an (interruptible) system call" },
#endif
#if defined (PR_PCINVAL)
/* Sol2.5: contents of pr_instr undefined
* Sol2.6: contents of pr_instr undefined
* Sol2.7: contents of pr_instr undefined
* IRIX6: current pc is invalid
* OSF: program counter contains invalid address
* UW: %pc refers to an invalid virtual address
*/
/* contents of pr_instr undefined */
{ PR_PCINVAL, "PR_PCINVAL", "PC (pr_instr) is invalid" },
#endif
#if defined (PR_ASLWP)
/* Sol2.5: this lwp is the aslwp
* Sol2.6: this lwp is the aslwp
* Sol2.7: this lwp is the aslwp
*/
/* this lwp is the aslwp */
{ PR_ASLWP, "PR_ASLWP", "This is the asynchronous signal LWP" },
#endif
#if defined (PR_AGENT)
/* Sol2.6: this lwp is the /proc agent lwp
* Sol2.7: this lwp is the /proc agent lwp
*/
/* this lwp is the /proc agent lwp */
{ PR_AGENT, "PR_AGENT", "This is the /proc agent LWP" },
#endif
#if defined (PR_ISSYS)
/* Sol2.5: system process
* Sol2.6: this is a system process
* Sol2.7: this is a system process
* IRIX6: process is a system process
* OSF: task/thread is a system task/thread
* UW: System process
*/
/* this is a system process */
{ PR_ISSYS, "PR_ISSYS", "Is a system process/thread" },
#endif
#if defined (PR_VFORKP)
/* Sol2.6: process is the parent of a vfork()d child
* Sol2.7: process is the parent of a vfork()d child
*/
/* process is the parent of a vfork()d child */
{ PR_VFORKP, "PR_VFORKP", "Process is the parent of a vforked child" },
#endif
#ifdef PR_ORPHAN
/* Sol2.6: process's process group is orphaned
* Sol2.7: process's process group is orphaned
*/
/* process's process group is orphaned */
{ PR_ORPHAN, "PR_ORPHAN", "Process's process group is orphaned" },
#endif
#if defined (PR_FORK)
/* Sol2.5: inherit-on-fork is in effect
* Sol2.6: inherit-on-fork is in effect
* Sol2.7: inherit-on-fork is in effect
* IRIX6: process has inherit-on-fork flag set
* OSF: task/thread has inherit-on-fork flag set
* UW: inherit-on-fork is in effect
*/
/* inherit-on-fork is in effect */
{ PR_FORK, "PR_FORK", "Inherit-on-fork is in effect" },
#endif
#if defined (PR_RLC)
/* Sol2.5: run-on-last-close is in effect
* Sol2.6: run-on-last-close is in effect
* Sol2.7: run-on-last-close is in effect
* IRIX6: process has run-on-last-close flag set
* OSF: task/thread has run-on-last-close flag set
* UW: Run-on-last-close is in effect
*/
/* run-on-last-close is in effect */
{ PR_RLC, "PR_RLC", "Run-on-last-close is in effect" },
#endif
#if defined (PR_KLC)
/* Sol2.5: kill-on-last-close is in effect
* Sol2.6: kill-on-last-close is in effect
* Sol2.7: kill-on-last-close is in effect
* IRIX6: process has kill-on-last-close flag set
* OSF: kill-on-last-close, superceeds RLC
* UW: kill-on-last-close is in effect
*/
/* kill-on-last-close is in effect */
{ PR_KLC, "PR_KLC", "Kill-on-last-close is in effect" },
#endif
#if defined (PR_ASYNC)
/* Sol2.5: asynchronous-stop is in effect
* Sol2.6: asynchronous-stop is in effect
* Sol2.7: asynchronous-stop is in effect
* OSF: asynchronous stop mode is in effect
* UW: asynchronous stop mode is in effect
*/
/* asynchronous-stop is in effect */
{ PR_ASYNC, "PR_ASYNC", "Asynchronous stop is in effect" },
#endif
#if defined (PR_MSACCT)
/* Sol2.5: micro-state usage accounting is in effect
* Sol2.6: micro-state usage accounting is in effect
* Sol2.7: micro-state usage accounting is in effect
*/
/* micro-state usage accounting is in effect */
{ PR_MSACCT, "PR_MSACCT", "Microstate accounting enabled" },
#endif
#if defined (PR_BPTADJ)
/* Sol2.5: breakpoint trap pc adjustment is in effect
* Sol2.6: breakpoint trap pc adjustment is in effect
* Sol2.7: breakpoint trap pc adjustment is in effect
*/
/* breakpoint trap pc adjustment is in effect */
{ PR_BPTADJ, "PR_BPTADJ", "Breakpoint PC adjustment in effect" },
#endif
#if defined (PR_PTRACE)
/* Note: different meanings on Solaris and Irix 6
* Sol2.5: obsolete, never set in SunOS5.0
* Sol2.6: ptrace-compatibility mode is in effect
* Sol2.7: ptrace-compatibility mode is in effect
* IRIX6: process is traced with ptrace() too
* OSF: task/thread is being traced by ptrace
* UW: Process is being controlled by ptrace(2)
*/
/* ptrace-compatibility mode is in effect */
{ PR_PTRACE, "PR_PTRACE", "Process is being controlled by ptrace" },
#endif
#if defined (PR_PCOMPAT)
/* Note: PCOMPAT on Sol2.5 means same thing as PTRACE on Sol2.6
* Sol2.5 (only): ptrace-compatibility mode is in effect
*/
{ PR_PCOMPAT, "PR_PCOMPAT", "Ptrace compatibility mode in effect" },
#endif
#ifdef PR_MSFORK
/* Sol2.6: micro-state accounting inherited on fork
* Sol2.7: micro-state accounting inherited on fork
*/
/* micro-state accounting inherited on fork */
{ PR_MSFORK, "PR_PCOMPAT", "Micro-state accounting inherited on fork" },
#endif
#ifdef PR_ISKTHREAD
/* Irix6: process is a kernel thread */
{ PR_ISKTHREAD, "PR_KTHREAD", "Process is a kernel thread" },
#endif
#ifdef PR_ABORT
/* OSF (only): abort the current stop condition */
{ PR_ABORT, "PR_ABORT", "Abort the current stop condition" },
#endif
#ifdef PR_TRACING
/* OSF: task is traced */
{ PR_TRACING, "PR_TRACING", "Task is traced" },
#endif
#ifdef PR_STOPFORK
/* OSF: stop child on fork */
{ PR_STOPFORK, "PR_STOPFORK", "Stop child on fork" },
#endif
#ifdef PR_STOPEXEC
/* OSF: stop on exec */
{ PR_STOPEXEC, "PR_STOPEXEC", "Stop on exec" },
#endif
#ifdef PR_STOPTERM
/* OSF: stop on task exit */
{ PR_STOPTERM, "PR_STOPTERM", "Stop on task exit" },
#endif
#ifdef PR_STOPTCR
/* OSF: stop on thread creation */
{ PR_STOPTCR, "PR_STOPTCR", "Stop on thread creation" },
#endif
#ifdef PR_STOPTTERM
/* OSF: stop on thread exit */
{ PR_STOPTTERM, "PR_STOPTTERM", "Stop on thread exit" },
#endif
#ifdef PR_USCHED
/* OSF: user level scheduling is in effect */
{ PR_USCHED, "PR_USCHED", "User level scheduling is in effect" },
#endif
};
void

View File

@ -1,4 +1,4 @@
/* Machine-independent support for SVR4 /proc (process file system)
/* Machine-independent support for Solaris /proc (process file system)
Copyright (C) 1999-2017 Free Software Foundation, Inc.
@ -20,9 +20,7 @@
#include "defs.h"
#ifdef NEW_PROC_API
#define _STRUCTURED_PROC 1
#endif
#include <sys/types.h>
#include <sys/procfs.h>
@ -47,55 +45,15 @@ struct trans
static struct trans pr_why_table[] =
{
#if defined (PR_REQUESTED)
/* All platforms. */
{ PR_REQUESTED, "PR_REQUESTED",
"Directed to stop by debugger via P(IO)CSTOP or P(IO)CWSTOP" },
#endif
#if defined (PR_SIGNALLED)
/* All platforms. */
{ PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal" },
#endif
#if defined (PR_SYSENTRY)
/* All platforms. */
{ PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call" },
#endif
#if defined (PR_SYSEXIT)
/* All platforms. */
{ PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call" },
#endif
#if defined (PR_JOBCONTROL)
/* All platforms. */
{ PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action" },
#endif
#if defined (PR_FAULTED)
/* All platforms. */
{ PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault" },
#endif
#if defined (PR_SUSPENDED)
/* Solaris only. */
{ PR_SUSPENDED, "PR_SUSPENDED", "Process suspended" },
#endif
#if defined (PR_CHECKPOINT)
/* Solaris only. */
{ PR_CHECKPOINT, "PR_CHECKPOINT", "Process stopped at checkpoint" },
#endif
#if defined (PR_FORKSTOP)
/* OSF/1 only. */
{ PR_FORKSTOP, "PR_FORKSTOP", "Process stopped at end of fork call" },
#endif
#if defined (PR_TCRSTOP)
/* OSF/1 only. */
{ PR_TCRSTOP, "PR_TCRSTOP", "Process stopped on thread creation" },
#endif
#if defined (PR_TTSTOP)
/* OSF/1 only. */
{ PR_TTSTOP, "PR_TTSTOP", "Process stopped on thread termination" },
#endif
#if defined (PR_DEAD)
/* OSF/1 only. */
{ PR_DEAD, "PR_DEAD", "Process stopped in exit system call" },
#endif
};
/* Pretty-print the pr_why field of a `struct prstatus' or `struct
@ -118,42 +76,25 @@ proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what,
fprintf (file, ": %s ", pr_why_table[i].desc);
switch (why) {
#ifdef PR_REQUESTED
case PR_REQUESTED:
break; /* Nothing more to print. */
#endif
#ifdef PR_SIGNALLED
case PR_SIGNALLED:
proc_prettyfprint_signal (file, what, verbose);
break;
#endif
#ifdef PR_FAULTED
case PR_FAULTED:
proc_prettyfprint_fault (file, what, verbose);
break;
#endif
#ifdef PR_SYSENTRY
case PR_SYSENTRY:
fprintf (file, "Entry to ");
proc_prettyfprint_syscall (file, what, verbose);
break;
#endif
#ifdef PR_SYSEXIT
case PR_SYSEXIT:
fprintf (file, "Exit from ");
proc_prettyfprint_syscall (file, what, verbose);
break;
#endif
#ifdef PR_JOBCONTROL
case PR_JOBCONTROL:
proc_prettyfprint_signal (file, what, verbose);
break;
#endif
#ifdef PR_DEAD
case PR_DEAD:
fprintf (file, "Exit status: %ld\n", what);
break;
#endif
default:
fprintf (file, "Unknown why %ld, what %ld\n", why, what);
break;

File diff suppressed because it is too large Load Diff

View File

@ -104,8 +104,6 @@ _initialize_sparc_sol2_nat (void)
struct target_ops *t;
t = procfs_target ();
#ifdef NEW_PROC_API /* Solaris 6 and above can do HW watchpoints. */
procfs_use_watchpoints (t);
#endif
add_target (t);
}