summaryrefslogtreecommitdiffstats
path: root/sys/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'sys/alpha')
-rw-r--r--sys/alpha/linux/linux.h91
-rw-r--r--sys/alpha/linux/linux_dummy.c1
-rw-r--r--sys/alpha/linux/linux_sysvec.c96
-rw-r--r--sys/alpha/linux/syscalls.master24
4 files changed, 115 insertions, 97 deletions
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index e55a367..f581314 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -47,35 +47,32 @@ typedef struct {
long val[2];
} linux_fsid_t;
typedef int linux_pid_t;
-typedef unsigned long linux_sigset_t;
-typedef void (*linux_handler_t)(int);
-typedef struct {
- void (*lsa_handler)(int);
- linux_sigset_t lsa_mask;
- unsigned long lsa_flags;
- void (*lsa_restorer)(void);
-} linux_sigaction_t;
typedef int linux_key_t;
+/*
+ * Signal stuff...
+ */
+typedef void (*linux_handler_t)(int);
+
+typedef unsigned long linux_osigset_t;
+
typedef struct {
- unsigned long sig[2];
-} linux_new_sigset_t;
+ unsigned int __bits[2];
+} linux_sigset_t;
+
typedef struct {
- void (*lsa_handler)(int);
- unsigned long lsa_flags;
- void (*lsa_restorer)(void);
- linux_new_sigset_t lsa_mask;
-} linux_new_sigaction_t;
+ void (*lsa_handler)(int);
+ linux_osigset_t lsa_mask;
+ unsigned long lsa_flags;
+ void (*lsa_restorer)(void);
+} linux_osigaction_t;
-#define LINUX_MAX_UTSNAME 65
-struct linux_new_utsname {
- char sysname[LINUX_MAX_UTSNAME];
- char nodename[LINUX_MAX_UTSNAME];
- char release[LINUX_MAX_UTSNAME];
- char version[LINUX_MAX_UTSNAME];
- char machine[LINUX_MAX_UTSNAME];
- char domainname[LINUX_MAX_UTSNAME];
-};
+typedef struct {
+ void (*lsa_handler)(int);
+ unsigned long lsa_flags;
+ void (*lsa_restorer)(void);
+ linux_sigset_t lsa_mask;
+} linux_sigaction_t;
/*
* The Linux sigcontext, pretty much a standard 386 trapframe.
@@ -121,20 +118,6 @@ struct linux_sigframe {
extern int bsd_to_linux_signal[];
extern int linux_to_bsd_signal[];
-extern char linux_sigcode[];
-extern int linux_szsigcode;
-extern const char linux_emul_path[];
-
-extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL];
-extern struct sysentvec linux_sysvec;
-extern struct sysentvec elf_linux_sysvec;
-
-/* dummy struct definitions */
-struct image_params;
-struct trapframe;
-
-/* misc defines */
-#define LINUX_NAME_MAX 255
/* signal numbers */
#define LINUX_SIGHUP 1
@@ -170,7 +153,8 @@ struct trapframe;
#define LINUX_SIGPOLL LINUX_SIGIO
#define LINUX_SIGPWR 30
#define LINUX_SIGUNUSED 31
-#define LINUX_NSIG 32
+#define LINUX_NSIG 64
+#define LINUX_SIGTBLSZ 31
/* sigaction flags */
#define LINUX_SA_NOCLDSTOP 0x00000001
@@ -188,6 +172,35 @@ struct trapframe;
#define LINUX_SIG_UNBLOCK 1
#define LINUX_SIG_SETMASK 2
+#define LINUX_SIGEMPTYSET(set) (set).__bits[0] = (set).__bits[1] = 0
+#define LINUX_SIGISMEMBER(set, sig) SIGISMEMBER(set, sig)
+#define LINUX_SIGADDSET(set, sig) SIGADDSET(set, sig)
+
+extern char linux_sigcode[];
+extern int linux_szsigcode;
+extern const char linux_emul_path[];
+
+extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL];
+extern struct sysentvec linux_sysvec;
+extern struct sysentvec elf_linux_sysvec;
+
+/* dummy struct definitions */
+struct image_params;
+struct trapframe;
+
+#define LINUX_MAX_UTSNAME 65
+struct linux_new_utsname {
+ char sysname[LINUX_MAX_UTSNAME];
+ char nodename[LINUX_MAX_UTSNAME];
+ char release[LINUX_MAX_UTSNAME];
+ char version[LINUX_MAX_UTSNAME];
+ char machine[LINUX_MAX_UTSNAME];
+ char domainname[LINUX_MAX_UTSNAME];
+};
+
+/* misc defines */
+#define LINUX_NAME_MAX 255
+
/* resource limits */
#define LINUX_RLIMIT_CPU 0
#define LINUX_RLIMIT_FSIZE 1
diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c
index 018446d..04c3b4a 100644
--- a/sys/alpha/linux/linux_dummy.c
+++ b/sys/alpha/linux/linux_dummy.c
@@ -102,7 +102,6 @@ DUMMY(rt_sigreturn);
DUMMY(rt_sigpending);
DUMMY(rt_sigtimedwait);
DUMMY(rt_sigqueueinfo);
-DUMMY(rt_sigsuspend);
DUMMY(pread);
DUMMY(pwrite);
DUMMY(capget);
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 871ccfb..ecaa359 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -64,7 +64,7 @@ static int elf_linux_fixup __P((long **stack_base,
struct image_params *iparams));
static void linux_prepsyscall __P((struct trapframe *tf, int *args,
u_int *code, caddr_t *params));
-static void linux_sendsig __P((sig_t catcher, int sig, int mask,
+static void linux_sendsig __P((sig_t catcher, int sig, sigset_t *mask,
u_long code));
/*
@@ -82,22 +82,26 @@ static int bsd_to_linux_errno[ELAST + 1] = {
-6, -6, -43, -42, -75, -6, -84
};
-int bsd_to_linux_signal[NSIG] = {
- 0, LINUX_SIGHUP, LINUX_SIGINT, LINUX_SIGQUIT,
- LINUX_SIGILL, LINUX_SIGTRAP, LINUX_SIGABRT, 0,
- LINUX_SIGFPE, LINUX_SIGKILL, LINUX_SIGBUS, LINUX_SIGSEGV,
- 0, LINUX_SIGPIPE, LINUX_SIGALRM, LINUX_SIGTERM,
- LINUX_SIGURG, LINUX_SIGSTOP, LINUX_SIGTSTP, LINUX_SIGCONT,
- LINUX_SIGCHLD, LINUX_SIGTTIN, LINUX_SIGTTOU, LINUX_SIGIO,
- LINUX_SIGXCPU, LINUX_SIGXFSZ, LINUX_SIGVTALRM, LINUX_SIGPROF,
- LINUX_SIGWINCH, 0, LINUX_SIGUSR1, LINUX_SIGUSR2
+int bsd_to_linux_signal[LINUX_SIGTBLSZ] = {
+ LINUX_SIGHUP, LINUX_SIGINT, LINUX_SIGQUIT, LINUX_SIGILL,
+ LINUX_SIGTRAP, LINUX_SIGABRT, 0, LINUX_SIGFPE,
+ LINUX_SIGKILL, LINUX_SIGBUS, LINUX_SIGSEGV, 0,
+ LINUX_SIGPIPE, LINUX_SIGALRM, LINUX_SIGTERM, LINUX_SIGURG,
+ LINUX_SIGSTOP, LINUX_SIGTSTP, LINUX_SIGCONT, LINUX_SIGCHLD,
+ LINUX_SIGTTIN, LINUX_SIGTTOU, LINUX_SIGIO, LINUX_SIGXCPU,
+ LINUX_SIGXFSZ, LINUX_SIGVTALRM, LINUX_SIGPROF, LINUX_SIGWINCH,
+ 0, LINUX_SIGUSR1, LINUX_SIGUSR2
};
-int linux_to_bsd_signal[LINUX_NSIG] = {
- 0, SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT, SIGBUS,
- SIGFPE, SIGKILL, SIGUSR1, SIGSEGV, SIGUSR2, SIGPIPE, SIGALRM, SIGTERM,
- SIGBUS, SIGCHLD, SIGCONT, SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG,
- SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGIO, SIGURG, 0
+int linux_to_bsd_signal[LINUX_SIGTBLSZ] = {
+ SIGHUP, SIGINT, SIGQUIT, SIGILL,
+ SIGTRAP, SIGABRT, SIGBUS, SIGFPE,
+ SIGKILL, SIGUSR1, SIGSEGV, SIGUSR2,
+ SIGPIPE, SIGALRM, SIGTERM, SIGBUS,
+ SIGCHLD, SIGCONT, SIGSTOP, SIGTSTP,
+ SIGTTIN, SIGTTOU, SIGURG, SIGXCPU,
+ SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH,
+ SIGIO, SIGURG, 0
};
/*
@@ -185,7 +189,7 @@ extern int _ucodesel, _udatasel;
*/
static void
-linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
+linux_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
{
register struct proc *p = curproc;
register struct trapframe *regs;
@@ -197,14 +201,14 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
oonstack = psp->ps_sigstk.ss_flags & SS_ONSTACK;
#ifdef DEBUG
- printf("Linux-emul(%ld): linux_sendsig(%p, %d, %d, %lu)\n",
- (long)p->p_pid, catcher, sig, mask, code);
+ printf("Linux-emul(%ld): linux_sendsig(%p, %d, %p, %lu)\n",
+ (long)p->p_pid, catcher, sig, (void*)mask, code);
#endif
/*
* Allocate space for the signal handler context.
*/
if ((psp->ps_flags & SAS_ALTSTACK) && !oonstack &&
- (psp->ps_sigonstack & sigmask(sig))) {
+ SIGISMEMBER(psp->ps_sigonstack, sig)) {
fp = (struct linux_sigframe *)(psp->ps_sigstk.ss_sp +
psp->ps_sigstk.ss_size - sizeof(struct linux_sigframe));
psp->ps_sigstk.ss_flags |= SS_ONSTACK;
@@ -224,10 +228,9 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
* instruction to halt it in its tracks.
*/
SIGACTION(p, SIGILL) = SIG_DFL;
- sig = sigmask(SIGILL);
- p->p_sigignore &= ~sig;
- p->p_sigcatch &= ~sig;
- p->p_sigmask &= ~sig;
+ SIGDELSET(p->p_sigignore, SIGILL);
+ SIGDELSET(p->p_sigcatch, SIGILL);
+ SIGDELSET(p->p_sigmask, SIGILL);
psignal(p, SIGILL);
return;
}
@@ -235,12 +238,9 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
/*
* Build the argument list for the signal handler.
*/
- if (p->p_sysent->sv_sigtbl) {
- if (sig < p->p_sysent->sv_sigsize)
- sig = p->p_sysent->sv_sigtbl[sig];
- else
- sig = p->p_sysent->sv_sigsize + 1;
- }
+ if (p->p_sysent->sv_sigtbl)
+ if (sig <= p->p_sysent->sv_sigsize)
+ sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)];
frame.sf_handler = catcher;
frame.sf_sig = sig;
@@ -248,7 +248,7 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
/*
* Build the signal context to be used by sigreturn.
*/
- frame.sf_sc.sc_mask = mask;
+ frame.sf_sc.sc_mask = mask->__bits[0];
frame.sf_sc.sc_gs = rgs();
frame.sf_sc.sc_fs = regs->tf_fs;
frame.sf_sc.sc_es = regs->tf_es;
@@ -355,8 +355,12 @@ linux_sigreturn(p, args)
}
p->p_sigacts->ps_sigstk.ss_flags &= ~SS_ONSTACK;
- p->p_sigmask = context.sc_mask &~
- (sigmask(SIGKILL)|sigmask(SIGCONT)|sigmask(SIGSTOP));
+ SIGEMPTYSET(p->p_sigmask);
+ p->p_sigmask.__bits[0] = context.sc_mask;
+ SIGDELSET(p->p_sigmask, SIGKILL);
+ SIGDELSET(p->p_sigmask, SIGCONT);
+ SIGDELSET(p->p_sigmask, SIGSTOP);
+
/*
* Restore signal context.
*/
@@ -395,7 +399,7 @@ struct sysentvec linux_sysvec = {
LINUX_SYS_MAXSYSCALL,
linux_sysent,
0xff,
- NSIG,
+ LINUX_SIGTBLSZ,
bsd_to_linux_signal,
ELAST + 1,
bsd_to_linux_errno,
@@ -410,19 +414,19 @@ struct sysentvec linux_sysvec = {
};
struct sysentvec elf_linux_sysvec = {
- LINUX_SYS_MAXSYSCALL,
- linux_sysent,
- 0xff,
- NSIG,
- bsd_to_linux_signal,
- ELAST + 1,
- bsd_to_linux_errno,
- translate_traps,
- elf_linux_fixup,
- linux_sendsig,
- linux_sigcode,
- &linux_szsigcode,
- linux_prepsyscall,
+ LINUX_SYS_MAXSYSCALL,
+ linux_sysent,
+ 0xff,
+ LINUX_SIGTBLSZ,
+ bsd_to_linux_signal,
+ ELAST + 1,
+ bsd_to_linux_errno,
+ translate_traps,
+ elf_linux_fixup,
+ linux_sendsig,
+ linux_sigcode,
+ &linux_szsigcode,
+ linux_prepsyscall,
"Linux ELF",
elf_coredump
};
diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index ab7c209..e8766a9 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -102,15 +102,16 @@
65 NOPROTO LINUX { int getpgrp(void); }
66 NOPROTO LINUX { int setsid(void); }
67 STD LINUX { int linux_sigaction(int sig, \
- struct linux_sigaction *nsa, \
- struct linux_sigaction *osa); }
+ linux_osigaction_t *nsa, \
+ linux_osigaction_t *osa); }
68 STD LINUX { int linux_siggetmask(void); }
-69 STD LINUX { int linux_sigsetmask(linux_sigset_t mask); }
+69 STD LINUX { int linux_sigsetmask(linux_osigset_t mask); }
70 NOPROTO LINUX { int setreuid(int ruid, int euid); }
71 NOPROTO LINUX { int setregid(int rgid, int egid); }
72 STD LINUX { int linux_sigsuspend(int restart, \
- linux_sigset_t oldmask, linux_sigset_t mask); }
-73 STD LINUX { int linux_sigpending(linux_sigset_t *mask); }
+ linux_osigset_t oldmask, \
+ linux_osigset_t mask); }
+73 STD LINUX { int linux_sigpending(linux_osigset_t *mask); }
74 NOPROTO LINUX { int osethostname(char *hostname, u_int len); }
75 STD LINUX { int linux_setrlimit(u_int resource, \
struct ogetrlimit *rlim); }
@@ -186,7 +187,8 @@
124 STD LINUX { int linux_adjtimex(void); }
125 NOPROTO LINUX { int mprotect(caddr_t addr, int len, int prot); }
126 STD LINUX { int linux_sigprocmask(int how, \
- linux_sigset_t *mask, linux_sigset_t *omask); }
+ linux_osigset_t *mask, \
+ linux_osigset_t *omask); }
127 STD LINUX { int linux_create_module(void); }
128 STD LINUX { int linux_init_module(void); }
129 STD LINUX { int linux_delete_module(void); }
@@ -251,17 +253,17 @@
172 STD LINUX { int linux_prctl(void); }
173 STD LINUX { int linux_rt_sigreturn(void); }
174 STD LINUX { int linux_rt_sigaction(int sig, \
- struct linux_new_sigaction *act, \
- struct linux_new_sigaction *oact, \
+ linux_sigaction_t *act, \
+ linux_sigaction_t *oact, \
size_t sigsetsize); }
175 STD LINUX { int linux_rt_sigprocmask(int how, \
- struct linux_new_sigset *mask, \
- struct linux_new_sigset *omask, \
+ linux_sigset_t *mask, linux_sigset_t *omask, \
size_t sigsetsize); }
176 STD LINUX { int linux_rt_sigpending(void); }
177 STD LINUX { int linux_rt_sigtimedwait(void); }
178 STD LINUX { int linux_rt_sigqueueinfo(void); }
-179 STD LINUX { int linux_rt_sigsuspend(void); }
+179 STD LINUX { int linux_rt_sigsuspend(linux_sigset_t *newset, \
+ size_t sigsetsize); }
180 STD LINUX { int linux_pread(void); }
181 STD LINUX { int linux_pwrite(void); }
182 STD LINUX { int linux_chown(char *path, int uid, int gid); }
OpenPOWER on IntegriCloud