Merge the nathanw_sa branch.
This commit is contained in:
thorpej
parent
062c115a84
commit
064d091d71
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_fcntl.c,v 1.10 2002/09/06 13:18:43 gehenna Exp $ */
|
||||
/* $NetBSD: irix_fcntl.c,v 1.11 2003/01/18 07:44:50 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.10 2002/09/06 13:18:43 gehenna Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.11 2003/01/18 07:44:50 thorpej Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.10 2002/09/06 13:18:43 gehenna Exp
|
||||
#include <sys/filedesc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <miscfs/specfs/specdev.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_signal.c,v 1.22 2002/09/25 19:39:16 manu Exp $ */
|
||||
/* $NetBSD: irix_signal.c,v 1.23 2003/01/18 07:44:51 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.22 2002/09/25 19:39:16 manu Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.23 2003/01/18 07:44:51 thorpej Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
@ -265,7 +265,7 @@ irix_sendsig(sig, mask, code)
|
||||
sigset_t *mask;
|
||||
u_long code;
|
||||
{
|
||||
struct proc *p = curproc;
|
||||
struct proc *p = curlwp;
|
||||
void *sp;
|
||||
struct frame *f;
|
||||
int onstack;
|
||||
@ -423,7 +423,7 @@ irix_set_sigcontext (scp, mask, code, p)
|
||||
scp->isc_ownedfp = p->p_md.md_flags & MDP_FPUSED;
|
||||
if (scp->isc_ownedfp) {
|
||||
/* if FPU has current state, save it first */
|
||||
if (p == fpcurproc)
|
||||
if (p == fpcurlwp)
|
||||
savefpregs(p);
|
||||
(void)memcpy(&scp->isc_fpregs, &p->p_addr->u_pcb.pcb_fpregs,
|
||||
sizeof(scp->isc_fpregs));
|
||||
@ -473,7 +473,7 @@ irix_set_ucontext(ucp, mask, code, p)
|
||||
#ifndef SOFTFLOAT
|
||||
if (p->p_md.md_flags & MDP_FPUSED) {
|
||||
/* if FPU has current state, save it first */
|
||||
if (p == fpcurproc)
|
||||
if (p == fpcurlwp)
|
||||
savefpregs(p);
|
||||
(void)memcpy(&ucp->iuc_mcontext.svr4___fpregs,
|
||||
&p->p_addr->u_pcb.pcb_fpregs,
|
||||
@ -591,8 +591,8 @@ irix_get_ucontext(ucp, p)
|
||||
#ifndef SOFTFLOAT
|
||||
/* Disable the FPU to fault in FP registers. */
|
||||
f->f_regs[SR] &= ~MIPS_SR_COP_1_BIT;
|
||||
if (p == fpcurproc)
|
||||
fpcurproc = (struct proc *)0;
|
||||
if (p == fpcurlwp)
|
||||
fpcurlwp = (struct proc *)0;
|
||||
(void)memcpy(&p->p_addr->u_pcb.pcb_fpregs,
|
||||
&ucp->iuc_mcontext.svr4___fpregs,
|
||||
sizeof(p->p_addr->u_pcb.pcb_fpregs));
|
||||
@ -657,8 +657,8 @@ irix_get_sigcontext(scp, p)
|
||||
if (scp->isc_ownedfp) {
|
||||
/* Disable the FPU to fault in FP registers. */
|
||||
f->f_regs[SR] &= ~MIPS_SR_COP_1_BIT;
|
||||
if (p == fpcurproc)
|
||||
fpcurproc = (struct proc *)0;
|
||||
if (p == fpcurlwp)
|
||||
fpcurlwp = (struct proc *)0;
|
||||
(void)memcpy(&p->p_addr->u_pcb.pcb_fpregs, &scp->isc_fpregs,
|
||||
sizeof(scp->isc_fpregs));
|
||||
p->p_addr->u_pcb.pcb_fpregs.r_regs[32] = scp->isc_fpc_csr;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_stat.c,v 1.5 2002/03/16 20:43:52 christos Exp $ */
|
||||
/* $NetBSD: irix_stat.c,v 1.6 2003/01/18 07:44:51 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.5 2002/03/16 20:43:52 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.6 2003/01/18 07:44:51 thorpej Exp $");
|
||||
|
||||
#include <sys/errno.h>
|
||||
#include <sys/types.h>
|
||||
@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.5 2002/03/16 20:43:52 christos Exp $
|
||||
#include <sys/stdint.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <compat/common/compat_util.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_swap.c,v 1.7 2002/03/29 09:06:54 manu Exp $ */
|
||||
/* $NetBSD: irix_swap.c,v 1.8 2003/01/18 07:44:51 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.7 2002/03/29 09:06:54 manu Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.8 2003/01/18 07:44:51 thorpej Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.7 2002/03/29 09:06:54 manu Exp $");
|
||||
#include <sys/swap.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/namei.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <uvm/uvm_page.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_syssgi.c,v 1.33 2002/11/30 12:28:26 jdolecek Exp $ */
|
||||
/* $NetBSD: irix_syssgi.c,v 1.34 2003/01/18 07:44:51 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.33 2002/11/30 12:28:26 jdolecek Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.34 2003/01/18 07:44:51 thorpej Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_ddb.h"
|
||||
@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.33 2002/11/30 12:28:26 jdolecek Ex
|
||||
#include <sys/exec.h>
|
||||
#include <sys/exec_elf.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: irix_systeminfo.c,v 1.5 2002/11/09 09:03:58 manu Exp $ */
|
||||
/* $NetBSD: irix_systeminfo.c,v 1.6 2003/01/18 07:44:52 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.5 2002/11/09 09:03:58 manu Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.6 2003/01/18 07:44:52 thorpej Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.5 2002/11/09 09:03:58 manu Exp
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <compat/common/compat_util.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$NetBSD: syscalls.master,v 1.46 2002/10/05 23:17:30 manu Exp $
|
||||
$NetBSD: syscalls.master,v 1.47 2003/01/18 07:44:52 thorpej Exp $
|
||||
|
||||
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
|
||||
|
||||
@ -43,6 +43,7 @@
|
||||
#include <sys/mount.h>
|
||||
#include <sys/poll.h>
|
||||
#include <sys/ioctl_compat.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/syscallargs.h>
|
||||
|
||||
#include <compat/svr4/svr4_types.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user