[src/trunk]: src/sys/arch/i386/include restrict visibility of struct sigconte...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ecb97693bca0
branches:  trunk
changeset: 573148:ecb97693bca0
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Jan 20 20:55:55 2005 +0000

description:
restrict visibility of struct sigcontext* as much
as possible; include the needed opt_compat_*.h for
kernel code

diffstat:

 sys/arch/i386/include/signal.h |  21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diffs (64 lines):

diff -r 0fbb051d1bfe -r ecb97693bca0 sys/arch/i386/include/signal.h
--- a/sys/arch/i386/include/signal.h    Thu Jan 20 20:42:05 2005 +0000
+++ b/sys/arch/i386/include/signal.h    Thu Jan 20 20:55:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.26 2004/05/10 21:51:50 drochner Exp $     */
+/*     $NetBSD: signal.h,v 1.27 2005/01/20 20:55:55 drochner Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -39,6 +39,10 @@
 typedef int sig_atomic_t;
 
 #ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#include "opt_compat_ibcs2.h"
+#endif
 #ifdef COMPAT_16
 #define SIGTRAMP_VALID(vers)   ((unsigned)(vers) <= 2)
 #else
@@ -52,6 +56,7 @@
  */
 #include <machine/trap.h>
 
+#if defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_IBCS2))
 /*
  * Information pushed on stack when a signal is delivered.
  * This is used by the kernel to restore state following
@@ -59,7 +64,7 @@
  * to the handler to allow it to restore state properly if
  * a non-standard exit is performed.
  */
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(COMPAT_13)
 struct sigcontext13 {
        int     sc_gs;
        int     sc_fs;
@@ -85,12 +90,8 @@
        int     sc_trapno;              /* XXX should be above */
        int     sc_err;
 };
-#endif
+#endif /* COMPAT_13 */
 
-/*
- * We expose this to userland for legacy interfaces, but only use
- * it in the kernel for compat code.
- */
 struct sigcontext {
        int     sc_gs;
        int     sc_fs;
@@ -118,11 +119,7 @@
 
        sigset_t sc_mask;               /* signal mask to restore (new style) */
 };
-
-#define sc_sp sc_esp
-#define sc_fp sc_ebp
-#define sc_pc sc_eip
-#define sc_ps sc_eflags
+#endif /* _KERNEL && (COMPAT_16 || COMPAT_IBCS2) */
 
 #endif /* _NETBSD_SOURCE */
 #endif /* !_I386_SIGNAL_H_ */