Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to match proc.h.

This commit is contained in:
mycroft 1994-05-04 03:47:10 +00:00
parent 4bbabd8e7a
commit e3e3d72f66
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/hp300/dev/grf.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: grf.c 1.31 91/01/21
* from: @(#)grf.c 7.8 (Berkeley) 5/7/91
* $Id: grf.c,v 1.7 1994/04/08 06:32:26 hpeyerl Exp $
* $Id: grf.c,v 1.8 1994/05/04 03:47:10 mycroft Exp $
*/
/*
@ -220,7 +220,7 @@ grfopen(dev, flags)
/*
* XXX: cannot handle both HPUX and BSD processes at the same time
*/
if (curproc->p_flag & SHPUX)
if (curproc->p_emul == EMUL_HPUX)
if (gp->g_flags & GF_BSDOPEN)
return(EBUSY);
else
@ -267,7 +267,7 @@ grfioctl(dev, cmd, data, flag, p)
int error;
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
return(hpuxgrfioctl(dev, cmd, data, flag, p));
#endif
error = 0;

8
sys/arch/hp300/dev/hil.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: hil.c 1.33 89/12/22
* from: @(#)hil.c 7.8.1.1 (Berkeley) 6/28/91
* $Id: hil.c,v 1.11 1994/04/10 22:12:32 hpeyerl Exp $
* $Id: hil.c,v 1.12 1994/05/04 03:47:12 mycroft Exp $
*/
#include <sys/param.h>
@ -157,7 +157,7 @@ hilopen(dev, flags, mode, p)
* 3. BSD processes default to shared queue interface.
* Multiple processes can open the device.
*/
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
if (dptr->hd_flags & (HIL_READIN|HIL_QUEUEIN))
return(EBUSY);
dptr->hd_flags |= HIL_READIN;
@ -215,7 +215,7 @@ hilclose(dev, flags)
if (device && (dptr->hd_flags & HIL_PSEUDO))
return (0);
if ((p->p_flag & SHPUX) == 0) {
if (p->p_emul != EMUL_HPUX) {
/*
* If this is the loop device,
* free up all queues belonging to this process.
@ -382,7 +382,7 @@ hilioctl(dev, cmd, data, flag, p)
}
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
return(hpuxhilioctl(dev, cmd, data, flag));
#endif

14
sys/arch/hp300/hp300/machdep.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: machdep.c 1.63 91/04/24
* from: @(#)machdep.c 7.16 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.29 1994/04/24 06:14:02 mycroft Exp $
* $Id: machdep.c,v 1.30 1994/05/04 03:47:18 mycroft Exp $
*/
#include "param.h"
@ -366,7 +366,7 @@ setregs(p, entry, stack, retval)
m68881_restore(&p->p_addr->u_pcb.pcb_fpregs);
#endif
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
p->p_regs[A0] = 0; /* not 68010 (bit 31), no FPA (30) */
retval[0] = 0; /* no float card */
@ -386,8 +386,8 @@ setregs(p, entry, stack, retval)
* I didn't want to muck up kern_exec.c with this code, so I
* stuck it here.
*/
if ((p->p_pptr->p_flag & SHPUX) &&
(p->p_flag & STRC)) {
if ((p->p_pptr->p_emul == EMUL_HPUX) &&
(p->p_flag & P_TRACED)) {
tweaksigcode(1);
p->p_addr->u_pcb.pcb_flags |= PCB_HPUXTRACE;
} else if (p->p_addr->u_pcb.pcb_flags & PCB_HPUXTRACE) {
@ -594,7 +594,7 @@ sendsig(catcher, sig, mask, code)
* the space with a `brk'.
*/
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
fsize = sizeof(struct sigframe) + sizeof(struct hpuxsigframe);
else
#endif
@ -698,7 +698,7 @@ sendsig(catcher, sig, mask, code)
/*
* Create an HP-UX style sigcontext structure and associated goo
*/
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
register struct hpuxsigframe *hkfp;
hkfp = (struct hpuxsigframe *)&kfp[1];
@ -783,7 +783,7 @@ sigreturn(p, uap, retval)
* Grab context as an HP-UX style context and determine if it
* was one that we contructed in sendsig.
*/
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
struct hpuxsigcontext *hscp = (struct hpuxsigcontext *)scp;
struct hpuxsigcontext htsigc;

18
sys/arch/hp300/hp300/trap.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: trap.c 1.32 91/04/06
* from: @(#)trap.c 7.15 (Berkeley) 8/2/91
* $Id: trap.c,v 1.11 1994/04/10 08:23:02 mycroft Exp $
* $Id: trap.c,v 1.12 1994/05/04 03:47:20 mycroft Exp $
*/
#include "param.h"
@ -271,7 +271,7 @@ copyfault:
case T_ILLINST|T_USER: /* illegal instruction fault */
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
ucode = HPUX_ILL_ILLINST_TRAP;
i = SIGILL;
break;
@ -280,7 +280,7 @@ copyfault:
#endif
case T_PRIVINST|T_USER: /* privileged instruction fault */
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
ucode = HPUX_ILL_PRIV_TRAP;
else
#endif
@ -290,7 +290,7 @@ copyfault:
case T_ZERODIV|T_USER: /* Divide by zero */
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
ucode = HPUX_FPE_INTDIV_TRAP;
else
#endif
@ -300,7 +300,7 @@ copyfault:
case T_CHKINST|T_USER: /* CHK instruction trap */
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
/* handled differently under hp-ux */
i = SIGILL;
ucode = HPUX_ILL_CHK_TRAP;
@ -313,7 +313,7 @@ copyfault:
case T_TRAPVINST|T_USER: /* TRAPV instruction trap */
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX) {
if (p->p_emul == EMUL_HPUX) {
/* handled differently under hp-ux */
i = SIGILL;
ucode = HPUX_ILL_TRAPV_TRAP;
@ -503,7 +503,7 @@ syscall(code, frame)
p->p_regs = frame.f_regs;
opc = frame.f_pc;
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
callp = hpux_sysent, numsys = nhpux_sysent;
else
#endif
@ -517,7 +517,7 @@ syscall(code, frame)
case SYS___syscall:
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
break;
#endif
code = fuword(params + _QUAD_LOWWORD * sizeof(int));
@ -579,7 +579,7 @@ syscall(code, frame)
default:
bad:
#ifdef HPUXCOMPAT
if (p->p_flag & SHPUX)
if (p->p_emul == EMUL_HPUX)
error = bsdtohpuxerrno(error);
#endif
frame.f_regs[D0] = error;

4
sys/arch/hp300/hpux/hpux_sig.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: hpux_sig.c 1.1 90/07/09
* from: @(#)hpux_sig.c 7.8 (Berkeley) 4/20/91
* $Id: hpux_sig.c,v 1.4 1994/01/07 00:43:53 mycroft Exp $
* $Id: hpux_sig.c,v 1.5 1994/05/04 03:47:24 mycroft Exp $
*/
/*
@ -336,7 +336,7 @@ hpux_sigaction(p, uap, retval)
if (p->p_flag & SOUSIG)
sa->sa_flags |= HPUXSA_RESETHAND; /* XXX */
#endif
if (p->p_flag & SNOCLDSTOP)
if (p->p_flag & P_NOCLDSTOP)
sa->sa_flags |= HPUXSA_NOCLDSTOP;
if (copyout((caddr_t)sa, (caddr_t)uap->osa, sizeof (action)))
return (EFAULT);

4
sys/arch/hp300/include/pcb.h
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: pcb.h 1.13 89/04/23
* from: @(#)pcb.h 7.4 (Berkeley) 5/4/91
* $Id: pcb.h,v 1.3 1993/08/01 19:25:05 mycroft Exp $
* $Id: pcb.h,v 1.4 1994/05/04 03:47:26 mycroft Exp $
*/
#include <machine/frame.h>
@ -63,4 +63,4 @@ struct pcb
#define PCB_HPUXMMAP 0x0010 /* VA space is multiple mapped */
#define PCB_HPUXTRACE 0x0020 /* being traced by an HPUX process */
#define PCB_HPUXBIN 0x0040 /* loaded from an HPUX format binary */
/* note: does NOT imply SHPUX */
/* note: does NOT imply EMUL_HPUX */

4
sys/compat/hpux/hpux_sig.c
View File

@ -37,7 +37,7 @@
*
* from: Utah Hdr: hpux_sig.c 1.1 90/07/09
* from: @(#)hpux_sig.c 7.8 (Berkeley) 4/20/91
* $Id: hpux_sig.c,v 1.4 1994/01/07 00:43:53 mycroft Exp $
* $Id: hpux_sig.c,v 1.5 1994/05/04 03:47:24 mycroft Exp $
*/
/*
@ -336,7 +336,7 @@ hpux_sigaction(p, uap, retval)
if (p->p_flag & SOUSIG)
sa->sa_flags |= HPUXSA_RESETHAND; /* XXX */
#endif
if (p->p_flag & SNOCLDSTOP)
if (p->p_flag & P_NOCLDSTOP)
sa->sa_flags |= HPUXSA_NOCLDSTOP;
if (copyout((caddr_t)sa, (caddr_t)uap->osa, sizeof (action)))
return (EFAULT);