Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha/include expose struct sigcontext* just as muc...
details: https://anonhg.NetBSD.org/src/rev/aa80bc19a601
branches: trunk
changeset: 573149:aa80bc19a601
user: drochner <drochner%NetBSD.org@localhost>
date: Thu Jan 20 21:03:26 2005 +0000
description:
expose struct sigcontext* just as much as necessary
diffstat:
sys/arch/alpha/include/frame.h | 6 +++---
sys/arch/alpha/include/signal.h | 14 +++++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diffs (83 lines):
diff -r ecb97693bca0 -r aa80bc19a601 sys/arch/alpha/include/frame.h
--- a/sys/arch/alpha/include/frame.h Thu Jan 20 20:55:55 2005 +0000
+++ b/sys/arch/alpha/include/frame.h Thu Jan 20 21:03:26 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.5 2003/10/07 17:04:19 skd Exp $ */
+/* $NetBSD: frame.h,v 1.6 2005/01/20 21:03:26 drochner Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -91,7 +91,7 @@
unsigned long tf_regs[FRAME_SIZE]; /* See above */
};
-#if defined(COMPAT_16) && defined(_KERNEL)
+#if (defined(COMPAT_16) || defined(COMPAT_OSF1)) && defined(_KERNEL)
struct sigframe_sigcontext {
/* ra address of trampoline */
/* a0 signum for handler */
@@ -114,7 +114,7 @@
void *getframe(const struct lwp *, int, int *);
void buildcontext(struct lwp *, const void *, const void *, const void *);
void sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
-#ifdef COMPAT_16
+#if defined(COMPAT_16) || defined(COMPAT_OSF1)
void sendsig_sigcontext(const ksiginfo_t *, const sigset_t *);
#endif
#endif
diff -r ecb97693bca0 -r aa80bc19a601 sys/arch/alpha/include/signal.h
--- a/sys/arch/alpha/include/signal.h Thu Jan 20 20:55:55 2005 +0000
+++ b/sys/arch/alpha/include/signal.h Thu Jan 20 21:03:26 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.12 2004/05/10 21:51:49 drochner Exp $ */
+/* $NetBSD: signal.h,v 1.13 2005/01/20 21:03:26 drochner Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -35,6 +35,10 @@
typedef long sig_atomic_t;
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#include "opt_compat_osf1.h"
+#endif
#ifdef COMPAT_16
#define SIGTRAMP_VALID(vers) ((unsigned)(vers) <= 2)
#else
@@ -42,7 +46,6 @@
#endif
#endif
-#if defined(_NETBSD_SOURCE)
/*
* Information pushed on stack when a signal is delivered.
* This is used by the kernel to restore state following
@@ -53,7 +56,7 @@
* Note that sc_regs[] and sc_fpregs[]+sc_fpcr are inline
* representations of 'struct reg' and 'struct fpreg', respectively.
*/
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
+#if defined(_KERNEL) && (defined(COMPAT_13) || defined(COMPAT_OSF1))
struct sigcontext13 {
long sc_onstack; /* sigstack state to restore */
long sc_mask; /* signal mask to restore (old style) */
@@ -68,8 +71,9 @@
long sc_reserved[2]; /* XXX */
long sc_xxx[8]; /* XXX */
};
-#endif /* __LIBC12_SOURCE__ || _KERNEL */
+#endif /* _KERNEL && (COMPAT_13 || COMPAT_OSF1) */
+#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_OSF1)))
struct sigcontext {
long sc_onstack; /* sigstack state to restore */
long __sc_mask13; /* signal mask to restore (old style) */
@@ -85,6 +89,6 @@
long sc_xxx[8]; /* XXX */
sigset_t sc_mask; /* signal mask to restore (new style) */
};
+#endif /* _LIBC || _KERNEL */
-#endif /* _NETBSD_SOURCE */
#endif /* !_ALPHA_SIGNAL_H_*/
Home |
Main Index |
Thread Index |
Old Index