Author: jhb Date: Tue Mar 27 20:57:51 2018 New Revision: 331650 URL: https://svnweb.freebsd.org/changeset/base/331650
Log: Remove very old and unused signal information codes. These have been supplanted by the MI signal information codes in <sys/signal.h> since 7.0. The FPE_*_TRAP ones were deprecated even earlier in 1999. PR: 226579 (exp-run) Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D14637 Modified: head/sys/amd64/amd64/trap.c head/sys/amd64/ia32/ia32_signal.c head/sys/amd64/linux/linux_sysvec.c head/sys/amd64/linux32/linux32_sysvec.c head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c head/sys/cddl/dev/dtrace/i386/dtrace_subr.c head/sys/i386/i386/trap.c head/sys/i386/linux/linux_sysvec.c head/sys/x86/include/signal.h head/sys/x86/include/trap.h Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/amd64/amd64/trap.c Tue Mar 27 20:57:51 2018 (r331650) @@ -95,6 +95,7 @@ PMC_SOFT_DEFINE( , , page_fault, write); #include <machine/smp.h> #endif #include <machine/stack.h> +#include <machine/trap.h> #include <machine/tss.h> #ifdef KDTRACE_HOOKS @@ -338,14 +339,14 @@ trap(struct trapframe *frame) ucode = SEGV_ACCERR; } else { signo = SIGBUS; - ucode = BUS_PAGE_FAULT; + ucode = T_PAGEFLT; } } else if (prot_fault_translation == 1) { /* * Always compat mode. */ signo = SIGBUS; - ucode = BUS_PAGE_FAULT; + ucode = T_PAGEFLT; } else { /* * Always SIGSEGV mode. Modified: head/sys/amd64/ia32/ia32_signal.c ============================================================================== --- head/sys/amd64/ia32/ia32_signal.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/amd64/ia32/ia32_signal.c Tue Mar 27 20:57:51 2018 (r331650) @@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pcb.h> #include <machine/cpufunc.h> +#include <machine/trap.h> #ifdef COMPAT_FREEBSD4 static void freebsd4_ia32_sendsig(sig_t, ksiginfo_t *, sigset_t *); Modified: head/sys/amd64/linux/linux_sysvec.c ============================================================================== --- head/sys/amd64/linux/linux_sysvec.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/amd64/linux/linux_sysvec.c Tue Mar 27 20:57:51 2018 (r331650) @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pcb.h> #include <machine/specialreg.h> +#include <machine/trap.h> #include <amd64/linux/linux.h> #include <amd64/linux/linux_proto.h> Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Mar 27 20:57:51 2018 (r331650) @@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pcb.h> #include <machine/specialreg.h> +#include <machine/trap.h> #include <amd64/linux32/linux.h> #include <amd64/linux32/linux32_proto.h> Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Tue Mar 27 20:57:51 2018 (r331650) @@ -52,6 +52,7 @@ #include <machine/segments.h> #include <machine/reg.h> #include <machine/pcb.h> +#include <machine/trap.h> #endif #include <sys/sysmacros.h> #ifdef illumos Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Tue Mar 27 20:57:51 2018 (r331650) @@ -44,6 +44,7 @@ #include <machine/cpufunc.h> #include <machine/frame.h> #include <machine/psl.h> +#include <machine/trap.h> #include <vm/pmap.h> extern void dtrace_getnanotime(struct timespec *tsp); Modified: head/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Tue Mar 27 20:57:51 2018 (r331650) @@ -45,6 +45,7 @@ #include <machine/cpufunc.h> #include <machine/frame.h> #include <machine/psl.h> +#include <machine/trap.h> #include <vm/pmap.h> extern uintptr_t kernelbase; Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/i386/i386/trap.c Tue Mar 27 20:57:51 2018 (r331650) @@ -97,6 +97,7 @@ PMC_SOFT_DEFINE( , , page_fault, write); #include <machine/smp.h> #endif #include <machine/stack.h> +#include <machine/trap.h> #include <machine/tss.h> #include <machine/vm86.h> @@ -416,14 +417,14 @@ user_trctrap_out: ucode = SEGV_ACCERR; } else { signo = SIGBUS; - ucode = BUS_PAGE_FAULT; + ucode = T_PAGEFLT; } } else if (prot_fault_translation == 1) { /* * Always compat mode. */ signo = SIGBUS; - ucode = BUS_PAGE_FAULT; + ucode = T_PAGEFLT; } else { /* * Always SIGSEGV mode. Modified: head/sys/i386/linux/linux_sysvec.c ============================================================================== --- head/sys/i386/linux/linux_sysvec.c Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/i386/linux/linux_sysvec.c Tue Mar 27 20:57:51 2018 (r331650) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/pcb.h> +#include <machine/trap.h> #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> Modified: head/sys/x86/include/signal.h ============================================================================== --- head/sys/x86/include/signal.h Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/x86/include/signal.h Tue Mar 27 20:57:51 2018 (r331650) @@ -43,10 +43,6 @@ #include <sys/cdefs.h> #include <sys/_sigset.h> -#if __BSD_VISIBLE -#include <machine/trap.h> /* codes for SIGILL, SIGFPE */ -#endif - #ifdef __i386__ typedef int sig_atomic_t; Modified: head/sys/x86/include/trap.h ============================================================================== --- head/sys/x86/include/trap.h Tue Mar 27 20:54:57 2018 (r331649) +++ head/sys/x86/include/trap.h Tue Mar 27 20:57:51 2018 (r331650) @@ -66,30 +66,6 @@ #define T_RESERVED 30 /* reserved (unknown) */ #define T_DTRACE_RET 32 /* DTrace pid return */ -/* XXX most of the following codes aren't used, but could be. */ - -/* definitions for <sys/signal.h> */ -#define ILL_RESAD_FAULT T_RESADFLT -#define ILL_PRIVIN_FAULT T_PRIVINFLT -#define ILL_RESOP_FAULT T_RESOPFLT -#define ILL_ALIGN_FAULT T_ALIGNFLT -#define ILL_FPOP_FAULT T_FPOPFLT /* coprocessor operand fault */ - -/* old FreeBSD macros, deprecated */ -#define FPE_INTOVF_TRAP 0x1 /* integer overflow */ -#define FPE_INTDIV_TRAP 0x2 /* integer divide by zero */ -#define FPE_FLTDIV_TRAP 0x3 /* floating/decimal divide by zero */ -#define FPE_FLTOVF_TRAP 0x4 /* floating overflow */ -#define FPE_FLTUND_TRAP 0x5 /* floating underflow */ -#define FPE_FPU_NP_TRAP 0x6 /* floating point unit not present */ -#define FPE_SUBRNG_TRAP 0x7 /* subrange out of bounds */ - -/* codes for SIGBUS */ -#define BUS_PAGE_FAULT T_PAGEFLT /* page fault protection base */ -#define BUS_SEGNP_FAULT T_SEGNPFLT /* segment not present */ -#define BUS_STK_FAULT T_STKFLT /* stack segment */ -#define BUS_SEGM_FAULT T_RESERVED /* segment protection base */ - /* Trap's coming from user mode */ #define T_USER 0x100 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
