diff options
-rw-r--r-- | lib/libc/arch/hppa/SYS.h | 16 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/Ovfork.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/brk.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/fork.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/rfork.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sbrk.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigpending.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigprocmask.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/hppa/sys/sigsuspend.S | 8 |
9 files changed, 41 insertions, 39 deletions
diff --git a/lib/libc/arch/hppa/SYS.h b/lib/libc/arch/hppa/SYS.h index a358d8fb593..a196447b2b4 100644 --- a/lib/libc/arch/hppa/SYS.h +++ b/lib/libc/arch/hppa/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.11 2002/10/31 20:06:46 mickey Exp $ */ +/* $OpenBSD: SYS.h,v 1.12 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -38,9 +38,11 @@ #include <machine/vmparam.h> #undef _LOCORE -#define SYSENTRY(x) !\ -ENTRY(__CONCAT(_thread_sys_,x),0) !\ +#define SYSENTRY(x,n) !\ +ENTRY(__CONCAT(_thread_sys_,x),n) !\ .weak x ! .set x, __CONCAT(_thread_sys_,x) +#define SYSEXIT(x) !\ +EXIT(__CONCAT(_thread_sys_,x)) #define SYSCALL(x) !\ stw rp, HPPA_FRAME_ERP(sr0,sp) !\ @@ -58,14 +60,14 @@ ENTRY(__CONCAT(_thread_sys_,x),0) !\ .label __CONCAT(x,$noerr) #define PSEUDO(x,y) !\ -SYSENTRY(x) !\ +SYSENTRY(x,0) !\ SYSCALL(y) !\ bv r0(rp) !\ nop !\ -EXIT(__CONCAT(_thread_sys_,x)) +SYSEXIT(x) #define PSEUDO_NOERROR(x,y) !\ -SYSENTRY(x) !\ +SYSENTRY(x,0) !\ stw rp, HPPA_FRAME_ERP(sr0,sp) !\ ldil L%SYSCALLGATE, r1 !\ ble 4(sr7, r1) !\ @@ -73,7 +75,7 @@ SYSENTRY(x) !\ ldw HPPA_FRAME_ERP(sr0,sp), rp !\ bv r0(rp) !\ nop !\ -EXIT(__CONCAT(_thread_sys_,x)) +SYSEXIT(x) #define RSYSCALL(x) PSEUDO(x,x) diff --git a/lib/libc/arch/hppa/sys/Ovfork.S b/lib/libc/arch/hppa/sys/Ovfork.S index 6eeec92b005..8977cb09724 100644 --- a/lib/libc/arch/hppa/sys/Ovfork.S +++ b/lib/libc/arch/hppa/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.8 2002/07/25 04:58:57 mickey Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.9 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999,2002 Michael Shalayeff @@ -35,11 +35,11 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: Ovfork.S,v 1.8 2002/07/25 04:58:57 mickey Exp $" + .asciz "$OpenBSD: Ovfork.S,v 1.9 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(vfork,0) +SYSENTRY(vfork,0) .import errno, data copy rp, t4 ldil L%SYSCALLGATE, r1 @@ -56,6 +56,6 @@ ENTRY(vfork,0) addi -1, ret1, ret1 bv r0(rp) and ret1, ret0, ret0 -EXIT(vfork) +SYSEXIT(vfork) .end diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S index d215ebcf23f..b3ccff60570 100644 --- a/lib/libc/arch/hppa/sys/brk.S +++ b/lib/libc/arch/hppa/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.8 2002/10/07 09:35:34 mickey Exp $ */ +/* $OpenBSD: brk.S,v 1.9 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,7 +35,7 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: brk.S,v 1.8 2002/10/07 09:35:34 mickey Exp $" + .asciz "$OpenBSD: brk.S,v 1.9 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif @@ -47,7 +47,7 @@ __minbrk .long end -ENTRY(brk,0) +SYSENTRY(brk,0) ldil L%__minbrk, t1 ldw R%__minbrk(t1), t2 sub,<< t2, arg0, r0 @@ -60,7 +60,7 @@ ENTRY(brk,0) ldil L%__curbrk, t1 bv r0(rp) stw arg0, R%__curbrk(t1) -EXIT(brk) +SYSEXIT(brk) .end diff --git a/lib/libc/arch/hppa/sys/fork.S b/lib/libc/arch/hppa/sys/fork.S index 471f0e9735f..d954b6211e6 100644 --- a/lib/libc/arch/hppa/sys/fork.S +++ b/lib/libc/arch/hppa/sys/fork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */ +/* $OpenBSD: fork.S,v 1.8 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,15 +35,15 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $" + .asciz "$OpenBSD: fork.S,v 1.8 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(fork,0) +SYSENTRY(fork,0) SYSCALL(fork) addi -1, ret1, ret1 bv r0(rp) and ret0, ret1, ret0 -EXIT(fork) +SYSEXIT(fork) .end diff --git a/lib/libc/arch/hppa/sys/rfork.S b/lib/libc/arch/hppa/sys/rfork.S index f09bedee2cc..25c816a5e27 100644 --- a/lib/libc/arch/hppa/sys/rfork.S +++ b/lib/libc/arch/hppa/sys/rfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: rfork.S,v 1.1 2002/02/17 23:40:57 deraadt Exp $ */ +/* $OpenBSD: rfork.S,v 1.2 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,15 +35,15 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: rfork.S,v 1.1 2002/02/17 23:40:57 deraadt Exp $" + .asciz "$OpenBSD: rfork.S,v 1.2 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(rfork,0) +SYSENTRY(rfork,0) SYSCALL(rfork) addi -1, ret1, ret1 bv r0(rp) and ret0, ret1, ret0 -EXIT(rfork) +SYSEXIT(rfork) .end diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S index b7faf4113fa..ad6f4ff1061 100644 --- a/lib/libc/arch/hppa/sys/sbrk.S +++ b/lib/libc/arch/hppa/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.8 2002/10/07 09:35:34 mickey Exp $ */ +/* $OpenBSD: sbrk.S,v 1.9 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,7 +35,7 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: sbrk.S,v 1.8 2002/10/07 09:35:34 mickey Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.9 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif @@ -46,7 +46,7 @@ __curbrk .long end -ENTRY(sbrk,0) +SYSENTRY(sbrk,0) ldil L%__curbrk, t1 ldw R%__curbrk(t1), t2 add arg0, t2, arg0 @@ -60,7 +60,7 @@ ENTRY(sbrk,0) bv r0(rp) stw arg0, R%__curbrk(t1) -EXIT(sbrk) +SYSEXIT(sbrk) .end diff --git a/lib/libc/arch/hppa/sys/sigpending.S b/lib/libc/arch/hppa/sys/sigpending.S index daa6daf6ecd..ad96794ed3a 100644 --- a/lib/libc/arch/hppa/sys/sigpending.S +++ b/lib/libc/arch/hppa/sys/sigpending.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigpending.S,v 1.6 2001/06/04 23:14:05 mickey Exp $ */ +/* $OpenBSD: sigpending.S,v 1.7 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,16 +35,16 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: sigpending.S,v 1.6 2001/06/04 23:14:05 mickey Exp $" + .asciz "$OpenBSD: sigpending.S,v 1.7 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(sigpending,0) +SYSENTRY(sigpending,0) SYSCALL(sigpending) ldw HPPA_FRAME_ARG(0)(sp), t1 stw ret0, 0(t1) bv r0(rp) copy r0, ret0 -EXIT(sigpending) +SYSEXIT(sigpending) .end diff --git a/lib/libc/arch/hppa/sys/sigprocmask.S b/lib/libc/arch/hppa/sys/sigprocmask.S index 253f57525a6..baa70725a74 100644 --- a/lib/libc/arch/hppa/sys/sigprocmask.S +++ b/lib/libc/arch/hppa/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.9 2002/02/06 18:51:20 mickey Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.10 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,11 +35,11 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: sigprocmask.S,v 1.9 2002/02/06 18:51:20 mickey Exp $" + .asciz "$OpenBSD: sigprocmask.S,v 1.10 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(sigprocmask,0) +SYSENTRY(sigprocmask,0) /* just in case compiler forgot about this */ stw arg2, HPPA_FRAME_ARG(2)(sp) @@ -60,6 +60,6 @@ sigprocmask$call stw ret0, 0(arg2) bv r0(rp) copy r0, ret0 -EXIT(sigprocmask) +SYSEXIT(sigprocmask) .end diff --git a/lib/libc/arch/hppa/sys/sigsuspend.S b/lib/libc/arch/hppa/sys/sigsuspend.S index 4d93161985c..52eb0e3f544 100644 --- a/lib/libc/arch/hppa/sys/sigsuspend.S +++ b/lib/libc/arch/hppa/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.6 2001/06/04 23:14:05 mickey Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.7 2002/10/31 23:07:37 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -35,15 +35,15 @@ #ifdef SYSLIBC_SCCS .text - .asciz "$OpenBSD: sigsuspend.S,v 1.6 2001/06/04 23:14:05 mickey Exp $" + .asciz "$OpenBSD: sigsuspend.S,v 1.7 2002/10/31 23:07:37 mickey Exp $" .align 4 #endif -ENTRY(sigsuspend,0) +SYSENTRY(sigsuspend,0) ldw 0(arg0), arg0 stw arg0, HPPA_FRAME_ARG(0)(sp) SYSCALL(sigsuspend) -EXIT(sigsuspend) +SYSEXIT(sigsuspend) .end |