summaryrefslogtreecommitdiffstats
path: root/sys/compat
diff options
context:
space:
mode:
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/freebsd32/freebsd32_misc.c90
-rw-r--r--sys/compat/freebsd32/syscalls.master9
-rw-r--r--sys/compat/ia32/ia32_genassym.c1
-rw-r--r--sys/compat/ia32/ia32_signal.h50
-rw-r--r--sys/compat/ia32/ia32_sysvec.c3
5 files changed, 97 insertions, 56 deletions
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 461e8c0..41cb789 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$");
#include <compat/freebsd32/freebsd32_util.h>
#include <compat/freebsd32/freebsd32.h>
+#include <compat/freebsd32/freebsd32_signal.h>
#include <compat/freebsd32/freebsd32_proto.h>
CTASSERT(sizeof(struct timeval32) == 8);
@@ -192,12 +193,6 @@ freebsd4_freebsd32_getfsstat(struct thread *td, struct freebsd4_freebsd32_getfss
}
#endif
-struct sigaltstack32 {
- u_int32_t ss_sp;
- u_int32_t ss_size;
- int ss_flags;
-};
-
CTASSERT(sizeof(struct sigaltstack32) == 12);
int
@@ -2178,6 +2173,89 @@ freebsd32_thr_suspend(struct thread *td, struct freebsd32_thr_suspend_args *uap)
return (kern_thr_suspend(td, tsp));
}
+void
+siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst)
+{
+ bzero(dst, sizeof(*dst));
+ dst->si_signo = src->si_signo;
+ dst->si_errno = src->si_errno;
+ dst->si_code = src->si_code;
+ dst->si_pid = src->si_pid;
+ dst->si_uid = src->si_uid;
+ dst->si_status = src->si_status;
+ dst->si_addr = dst->si_addr;
+ dst->si_value.sigval_int = src->si_value.sival_int;
+ dst->si_timerid = src->si_timerid;
+ dst->si_overrun = src->si_overrun;
+}
+
+int
+freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *uap)
+{
+ struct timespec32 ts32;
+ struct timespec ts;
+ struct timespec *timeout;
+ sigset_t set;
+ ksiginfo_t ksi;
+ struct siginfo32 si32;
+ int error;
+
+ if (uap->timeout) {
+ error = copyin(uap->timeout, &ts32, sizeof(ts32));
+ if (error)
+ return (error);
+ ts.tv_sec = ts32.tv_sec;
+ ts.tv_nsec = ts32.tv_nsec;
+ timeout = &ts;
+ } else
+ timeout = NULL;
+
+ error = copyin(uap->set, &set, sizeof(set));
+ if (error)
+ return (error);
+
+ error = kern_sigtimedwait(td, set, &ksi, timeout);
+ if (error)
+ return (error);
+
+ if (uap->info) {
+ siginfo_to_siginfo32(&ksi.ksi_info, &si32);
+ error = copyout(&si32, uap->info, sizeof(struct siginfo32));
+ }
+
+ if (error == 0)
+ td->td_retval[0] = ksi.ksi_signo;
+ return (error);
+}
+
+/*
+ * MPSAFE
+ */
+int
+freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap)
+{
+ ksiginfo_t ksi;
+ struct siginfo32 si32;
+ sigset_t set;
+ int error;
+
+ error = copyin(uap->set, &set, sizeof(set));
+ if (error)
+ return (error);
+
+ error = kern_sigtimedwait(td, set, &ksi, NULL);
+ if (error)
+ return (error);
+
+ if (uap->info) {
+ siginfo_to_siginfo32(&ksi.ksi_info, &si32);
+ error = copyout(&si32, uap->info, sizeof(struct siginfo32));
+ }
+ if (error == 0)
+ td->td_retval[0] = ksi.ksi_signo;
+ return (error);
+}
+
#if 0
int
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index ceed358..5cfd0c8 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -578,10 +578,11 @@
343 AUE_SIGPENDING NOPROTO { int sigpending(sigset_t *set); }
344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \
const struct freebsd4_freebsd32_ucontext *sigcntxp); }
-; XXX implement
-345 AUE_SIGWAIT UNIMPL sigtimedwait
-; XXX implement
-346 AUE_NULL UNIMPL sigwaitinfo
+345 AUE_SIGWAIT STD { int freebsd32_sigtimedwait(const sigset_t *set, \
+ siginfo_t *info, \
+ const struct timespec *timeout); }
+346 AUE_NULL STD { int freebsd32_sigwaitinfo(const sigset_t *set, \
+ siginfo_t *info); }
347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \
acl_type_t type, struct acl *aclp); }
348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \
diff --git a/sys/compat/ia32/ia32_genassym.c b/sys/compat/ia32/ia32_genassym.c
index 54cec21..84fb648 100644
--- a/sys/compat/ia32/ia32_genassym.c
+++ b/sys/compat/ia32/ia32_genassym.c
@@ -8,6 +8,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/signal.h>
+#include <compat/freebsd32/freebsd32_signal.h>
#include <compat/ia32/ia32_signal.h>
ASSYM(IA32_SIGF_HANDLER, offsetof(struct ia32_sigframe, sf_ah));
diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h
index 8868a7e..f2be96d 100644
--- a/sys/compat/ia32/ia32_signal.h
+++ b/sys/compat/ia32/ia32_signal.h
@@ -29,12 +29,6 @@
* $FreeBSD$
*/
-struct ia32_sigaltstack {
- u_int32_t ss_sp; /* signal stack base */
- u_int32_t ss_size; /* signal stack length */
- int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */
-};
-
struct ia32_mcontext {
u_int32_t mc_onstack; /* XXX - sigcontext compat. */
u_int32_t mc_gs; /* machine state (struct trapframe) */
@@ -72,7 +66,7 @@ struct ia32_ucontext {
sigset_t uc_sigmask;
struct ia32_mcontext uc_mcontext;
u_int32_t uc_link;
- struct ia32_sigaltstack uc_stack;
+ struct sigaltstack32 uc_stack;
u_int32_t uc_flags;
u_int32_t __spare__[4];
};
@@ -108,7 +102,7 @@ struct ia32_ucontext4 {
sigset_t uc_sigmask;
struct ia32_mcontext4 uc_mcontext;
u_int32_t uc_link;
- struct ia32_sigaltstack uc_stack;
+ struct sigaltstack32 uc_stack;
u_int32_t __spare__[8];
};
#endif
@@ -142,39 +136,6 @@ struct ia32_sigcontext3 {
/*
* Signal frames, arguments passed to application signal handlers.
*/
-union ia32_sigval {
- int sigval_int;
- u_int32_t sigval_ptr;
-};
-struct ia32_siginfo {
- int si_signo; /* signal number */
- int si_errno; /* errno association */
- int si_code; /* signal code */
- int32_t si_pid; /* sending process */
- u_int32_t si_uid; /* sender's ruid */
- int si_status; /* exit value */
- u_int32_t si_addr; /* faulting instruction */
- union ia32_sigval si_value; /* signal value */
- union {
- struct {
- int _trapno;/* machine specific trap code */
- } _fault;
- struct {
- int _timerid;
- int _overrun;
- } _timer;
- struct {
- int _mqd;
- } _mesgq;
- struct {
- int _band; /* band event for SIGPOLL */
- } _poll; /* was this ever used ? */
- struct {
- int __spare1__;
- int __spare2__[7];
- } __spare__;
- } _reason;
-};
#ifdef COMPAT_FREEBSD4
struct ia32_sigframe4 {
@@ -184,7 +145,7 @@ struct ia32_sigframe4 {
u_int32_t sf_addr; /* undocumented 4th arg */
u_int32_t sf_ah; /* action/handler pointer */
struct ia32_ucontext4 sf_uc; /* = *sf_ucontext */
- struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
+ struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
#endif
@@ -196,7 +157,7 @@ struct ia32_sigframe {
u_int32_t sf_ah; /* action/handler pointer */
/* Beware, hole due to ucontext being 16 byte aligned! */
struct ia32_ucontext sf_uc; /* = *sf_ucontext */
- struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
+ struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
#ifdef COMPAT_FREEBSD3
@@ -204,7 +165,7 @@ struct ia32_siginfo3 {
struct ia32_sigcontext3 si_sc;
int si_signo;
int si_code;
- union ia32_sigval si_value;
+ union sigval32 si_value;
};
struct ia32_sigframe3 {
int sf_signum;
@@ -224,4 +185,3 @@ extern int sz_freebsd4_ia32_sigcode;
extern void ia32_sendsig(sig_t, struct ksiginfo *, sigset_t *);
extern void ia32_setregs(struct thread *td, u_long entry, u_long stack,
u_long ps_strings);
-extern void siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst);
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index ede511d..b31400c 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
+#include <compat/freebsd32/freebsd32_signal.h>
#include <compat/freebsd32/freebsd32_util.h>
#include <compat/freebsd32/freebsd32_proto.h>
#include <compat/freebsd32/freebsd32_syscall.h>
@@ -85,7 +86,7 @@ __FBSDID("$FreeBSD$");
CTASSERT(sizeof(struct ia32_mcontext) == 640);
CTASSERT(sizeof(struct ia32_ucontext) == 704);
CTASSERT(sizeof(struct ia32_sigframe) == 800);
-CTASSERT(sizeof(struct ia32_siginfo) == 64);
+CTASSERT(sizeof(struct siginfo32) == 64);
#ifdef COMPAT_FREEBSD4
CTASSERT(sizeof(struct ia32_mcontext4) == 260);
CTASSERT(sizeof(struct ia32_ucontext4) == 324);
OpenPOWER on IntegriCloud