diff options
28 files changed, 213 insertions, 45 deletions
diff --git a/lib/libc/arch/alpha/net/Makefile.inc b/lib/libc/arch/alpha/net/Makefile.inc index 5eedd2608ee..c3becef9618 100644 --- a/lib/libc/arch/alpha/net/Makefile.inc +++ b/lib/libc/arch/alpha/net/Makefile.inc @@ -1,3 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:10:49 tholo Exp $ +# $OpenBSD: Makefile.inc,v 1.4 1996/11/13 22:05:02 niklas Exp $ +# $NetBSD: Makefile.inc,v 1.2 1996/04/17 22:36:42 cgd Exp $ SRCS+= htonl.S htons.S ntohl.S ntohs.S diff --git a/lib/libc/arch/alpha/net/byte_swap_2.S b/lib/libc/arch/alpha/net/byte_swap_2.S index 3b86f340c4e..fcecc7ff7b0 100644 --- a/lib/libc/arch/alpha/net/byte_swap_2.S +++ b/lib/libc/arch/alpha/net/byte_swap_2.S @@ -1,3 +1,6 @@ +/* $OpenBSD: byte_swap_2.S,v 1.3 1996/11/13 22:05:03 niklas Exp $ */ +/* $NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -25,11 +28,11 @@ * rights to redistribute these changes. */ -#include "DEFS.h" +#include <machine/asm.h> #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: byte_swap_2.S,v 1.2 1996/08/19 08:10:50 tholo Exp $" + .asciz "$OpenBSD: byte_swap_2.S,v 1.3 1996/11/13 22:05:03 niklas Exp $" #endif #ifndef NAME diff --git a/lib/libc/arch/alpha/net/byte_swap_4.S b/lib/libc/arch/alpha/net/byte_swap_4.S index 32aa519920b..80cff45e193 100644 --- a/lib/libc/arch/alpha/net/byte_swap_4.S +++ b/lib/libc/arch/alpha/net/byte_swap_4.S @@ -1,3 +1,6 @@ +/* $OpenBSD: byte_swap_4.S,v 1.3 1996/11/13 22:05:03 niklas Exp $ */ +/* $NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -25,11 +28,11 @@ * rights to redistribute these changes. */ -#include "DEFS.h" +#include <machine/asm.h> #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: byte_swap_4.S,v 1.2 1996/08/19 08:10:51 tholo Exp $" + .asciz "$OpenBSD: byte_swap_4.S,v 1.3 1996/11/13 22:05:03 niklas Exp $" #endif #ifndef NAME diff --git a/lib/libc/arch/alpha/net/htonl.S b/lib/libc/arch/alpha/net/htonl.S index 917864c840f..67184bdf547 100644 --- a/lib/libc/arch/alpha/net/htonl.S +++ b/lib/libc/arch/alpha/net/htonl.S @@ -1,3 +1,6 @@ +/* $OpenBSD: htonl.S,v 1.3 1996/11/13 22:05:04 niklas Exp $ */ +/* $NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +30,7 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: htonl.S,v 1.2 1996/08/19 08:10:52 tholo Exp $" + .asciz "$OpenBSD: htonl.S,v 1.3 1996/11/13 22:05:04 niklas Exp $" #endif #define NAME htonl diff --git a/lib/libc/arch/alpha/net/htons.S b/lib/libc/arch/alpha/net/htons.S index 2474b67497e..1826ff30356 100644 --- a/lib/libc/arch/alpha/net/htons.S +++ b/lib/libc/arch/alpha/net/htons.S @@ -1,3 +1,6 @@ +/* $OpenBSD: htons.S,v 1.3 1996/11/13 22:05:04 niklas Exp $ */ +/* $NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +30,7 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: htons.S,v 1.2 1996/08/19 08:10:53 tholo Exp $" + .asciz "$OpenBSD: htons.S,v 1.3 1996/11/13 22:05:04 niklas Exp $" #endif #define NAME htons diff --git a/lib/libc/arch/alpha/net/ntohl.S b/lib/libc/arch/alpha/net/ntohl.S index 8607fb268a0..986d1b63be2 100644 --- a/lib/libc/arch/alpha/net/ntohl.S +++ b/lib/libc/arch/alpha/net/ntohl.S @@ -1,3 +1,6 @@ +/* $OpenBSD: ntohl.S,v 1.3 1996/11/13 22:05:05 niklas Exp $ */ +/* $NetBSD: ntohl.S,v 1.1 1996/04/17 22:36:57 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +30,7 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: ntohl.S,v 1.2 1996/08/19 08:10:54 tholo Exp $" + .asciz "$OpenBSD: ntohl.S,v 1.3 1996/11/13 22:05:05 niklas Exp $" #endif #define NAME ntohl diff --git a/lib/libc/arch/alpha/net/ntohs.S b/lib/libc/arch/alpha/net/ntohs.S index d9904af5323..a2aa0db4c79 100644 --- a/lib/libc/arch/alpha/net/ntohs.S +++ b/lib/libc/arch/alpha/net/ntohs.S @@ -1,3 +1,6 @@ +/* $OpenBSD: ntohs.S,v 1.3 1996/11/13 22:05:05 niklas Exp $ */ +/* $NetBSD: ntohs.S,v 1.1 1996/04/17 22:37:02 cgd Exp $ */ + /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +30,7 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: ntohs.S,v 1.2 1996/08/19 08:10:55 tholo Exp $" + .asciz "$OpenBSD: ntohs.S,v 1.3 1996/11/13 22:05:05 niklas Exp $" #endif #define NAME ntohs diff --git a/lib/libc/arch/alpha/string/Makefile.inc b/lib/libc/arch/alpha/string/Makefile.inc index 87af75c1363..2586dc3e6a9 100644 --- a/lib/libc/arch/alpha/string/Makefile.inc +++ b/lib/libc/arch/alpha/string/Makefile.inc @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:10:56 tholo Exp $ +# $OpenBSD: Makefile.inc,v 1.4 1996/11/13 22:05:06 niklas Exp $ +# $NetBSD: Makefile.inc,v 1.4 1996/07/15 03:13:18 cgd Exp $ -SRCS+= bcmp.c bcopy.S bzero.S ffs.c index.c memchr.c memcmp.c memset.c \ +SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memchr.c memcmp.c memset.c \ rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlen.c \ strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \ strspn.c strstr.c swab.c diff --git a/lib/libc/arch/alpha/string/bcopy.S b/lib/libc/arch/alpha/string/bcopy.S index fed16bdb484..5b503b639e3 100644 --- a/lib/libc/arch/alpha/string/bcopy.S +++ b/lib/libc/arch/alpha/string/bcopy.S @@ -1,3 +1,6 @@ +/* $OpenBSD: bcopy.S,v 1.3 1996/11/13 22:05:07 niklas Exp $ */ +/* $NetBSD: bcopy.S,v 1.3 1996/10/17 03:08:11 cgd Exp $ */ + /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -28,10 +31,10 @@ #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: bcopy.S,v 1.2 1996/08/19 08:10:58 tholo Exp $" + .asciz "$OpenBSD: bcopy.S,v 1.3 1996/11/13 22:05:07 niklas Exp $" #endif -#include "DEFS.h" +include <machine/asm.h> #if defined(MEMCOPY) || defined(MEMMOVE) #ifdef MEMCOPY diff --git a/lib/libc/arch/alpha/string/bzero.S b/lib/libc/arch/alpha/string/bzero.S index 6d3aa0fcec6..d9596dd5f6f 100644 --- a/lib/libc/arch/alpha/string/bzero.S +++ b/lib/libc/arch/alpha/string/bzero.S @@ -1,3 +1,6 @@ +/* $OpenBSD: bzero.S,v 1.3 1996/11/13 22:05:07 niklas Exp $ */ +/* $NetBSD: bzero.S,v 1.2 1996/10/17 03:08:12 cgd Exp $ */ + /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -25,11 +28,11 @@ * rights to redistribute these changes. */ -#include "DEFS.h" +#include <machine/asm.h> #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: bzero.S,v 1.2 1996/08/19 08:10:59 tholo Exp $" + .asciz "$OpenBSD: bzero.S,v 1.3 1996/11/13 22:05:07 niklas Exp $" #endif LEAF(bzero,2) diff --git a/lib/libc/arch/alpha/string/ffs.S b/lib/libc/arch/alpha/string/ffs.S new file mode 100644 index 00000000000..4c30a164c27 --- /dev/null +++ b/lib/libc/arch/alpha/string/ffs.S @@ -0,0 +1,91 @@ +/* $NetBSD: ffs.S,v 1.3 1996/10/17 03:08:13 cgd Exp $ */ + +/* + * Copyright (c) 1995 Christopher G. Demetriou + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christopher G. Demetriou + * for the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <machine/asm.h> + +LEAF(ffs, 1) + addl a0, 0, t0 + beq t0, Lallzero + + /* + * Initialize return value (v0), and set up t1 so that it + * contains the mask with only the lowest bit set. + */ + subl zero, t0, t1 + ldil v0, 1 + and t0, t1, t1 + + and t1, 0xff, t2 + bne t2, Ldo8 + + /* + * If lower 16 bits empty, add 16 to result and use upper 16. + */ + zapnot t1, 0x03, t3 + bne t3, Ldo16 + sra t1, 16, t1 + addl v0, 16, v0 + +Ldo16: + /* + * If lower 8 bits empty, add 8 to result and use upper 8. + */ + and t1, 0xff, t4 + bne t4, Ldo8 + sra t1, 8, t1 + addl v0, 8, v0 + +Ldo8: + and t1, 0x0f, t5 /* lower 4 of 8 empty? */ + and t1, 0x33, t6 /* lower 2 of each 4 empty? */ + and t1, 0x55, t7 /* lower 1 of each 2 empty? */ + + /* If lower 4 bits empty, add 4 to result. */ + bne t5, Ldo4 + addl v0, 4, v0 + +Ldo4: /* If lower 2 bits of each 4 empty, add 2 to result. */ + bne t6, Ldo2 + addl v0, 2, v0 + +Ldo2: /* If lower bit of each 2 empty, add 1 to result. */ + bne t7, Ldone + addl v0, 1, v0 + +Ldone: + RET + +Lallzero: + bis zero, zero, v0 + RET +END(ffs) diff --git a/lib/libc/arch/alpha/string/memcpy.S b/lib/libc/arch/alpha/string/memcpy.S index 61869002ae8..bf296d1c176 100644 --- a/lib/libc/arch/alpha/string/memcpy.S +++ b/lib/libc/arch/alpha/string/memcpy.S @@ -1,6 +1,9 @@ +/* $OpenBSD: memcpy.S,v 1.3 1996/11/13 22:05:08 niklas Exp $ */ +/* $NetBSD: memcpy.S,v 1.1 1995/08/13 00:40:47 cgd Exp $ */ + #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: memcpy.S,v 1.2 1996/08/19 08:11:00 tholo Exp $" + .asciz "$OpenBSD: memcpy.S,v 1.3 1996/11/13 22:05:08 niklas Exp $" #endif #define MEMCOPY diff --git a/lib/libc/arch/alpha/string/memmove.S b/lib/libc/arch/alpha/string/memmove.S index f95f9021010..4a42723de25 100644 --- a/lib/libc/arch/alpha/string/memmove.S +++ b/lib/libc/arch/alpha/string/memmove.S @@ -1,6 +1,9 @@ +/* $OpenBSD: memmove.S,v 1.3 1996/11/13 22:05:09 niklas Exp $ */ +/* $NetBSD: memmove.S,v 1.1 1995/08/13 00:40:48 cgd Exp $ */ + #if defined(LIBC_SCCS) .text - .asciz "$OpenBSD: memmove.S,v 1.2 1996/08/19 08:11:01 tholo Exp $" + .asciz "$OpenBSD: memmove.S,v 1.3 1996/11/13 22:05:09 niklas Exp $" #endif #define MEMMOVE diff --git a/lib/libc/arch/alpha/sys/Ovfork.S b/lib/libc/arch/alpha/sys/Ovfork.S index 8f6213421a1..334dc38202d 100644 --- a/lib/libc/arch/alpha/sys/Ovfork.S +++ b/lib/libc/arch/alpha/sys/Ovfork.S @@ -1,3 +1,6 @@ +/* $OpenBSD: Ovfork.S,v 1.3 1996/11/13 22:05:10 niklas Exp $ */ +/* $NetBSD: Ovfork.S,v 1.1 1995/02/10 17:50:29 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: Ovfork.S,v 1.2 1996/08/19 08:11:04 tholo Exp $" + .asciz "$OpenBSD: Ovfork.S,v 1.3 1996/11/13 22:05:10 niklas Exp $" #endif /* SYSLIBC_SCCS */ SYSCALL(vfork) diff --git a/lib/libc/arch/alpha/sys/brk.S b/lib/libc/arch/alpha/sys/brk.S index 6a93fa3f098..8451dcb9d64 100644 --- a/lib/libc/arch/alpha/sys/brk.S +++ b/lib/libc/arch/alpha/sys/brk.S @@ -1,3 +1,6 @@ +/* $OpenBSD: brk.S,v 1.4 1996/11/13 22:05:10 niklas Exp $ */ +/* $NetBSD: brk.S,v 1.4 1996/10/17 03:08:15 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: brk.S,v 1.3 1996/08/19 08:11:05 tholo Exp $" + .asciz "$OpenBSD: brk.S,v 1.4 1996/11/13 22:05:10 niklas Exp $" #endif /* SYSLIBC_SCCS */ .globl _end @@ -41,12 +44,12 @@ EXPORT(minbrk) .text LEAF(brk, 1) - br pv, 1f /* XXX profiling */ -1: SETGP(pv) + br pv, L1 /* XXX profiling */ +L1: LDGP(pv) ldq v0, minbrk cmpult a0, v0, t0 cmovne t0, v0, a0 - SYSCALL_NOLABEL(break) + CALLSYS_ERROR(break) stq a0, curbrk mov zero, v0 RET diff --git a/lib/libc/arch/alpha/sys/cerror.S b/lib/libc/arch/alpha/sys/cerror.S index 1a45b56d75c..d0057067f36 100644 --- a/lib/libc/arch/alpha/sys/cerror.S +++ b/lib/libc/arch/alpha/sys/cerror.S @@ -1,3 +1,6 @@ +/* $OpenBSD: cerror.S,v 1.3 1996/11/13 22:05:11 niklas Exp $ */ +/* $NetBSD: cerror.S,v 1.3 1996/10/17 03:08:17 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,14 +32,14 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: cerror.S,v 1.2 1996/08/19 08:11:06 tholo Exp $" + .asciz "$OpenBSD: cerror.S,v 1.3 1996/11/13 22:05:11 niklas Exp $" #endif /* SYSLIBC_SCCS */ IMPORT(errno, 4) LEAF(cerror, 0) - br t0, 1f -1: SETGP(t0) + br t0, L1 +L1: LDGP(t0) stl v0, errno ldiq v0, -1 RET diff --git a/lib/libc/arch/alpha/sys/exect.S b/lib/libc/arch/alpha/sys/exect.S index b6e8ba19c5b..f1e2353129b 100644 --- a/lib/libc/arch/alpha/sys/exect.S +++ b/lib/libc/arch/alpha/sys/exect.S @@ -1,3 +1,6 @@ +/* $OpenBSD: exect.S,v 1.3 1996/11/13 22:05:11 niklas Exp $ */ +/* $NetBSD: exect.S,v 1.2 1996/10/17 03:08:18 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,10 +32,10 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: exect.S,v 1.2 1996/08/19 08:11:07 tholo Exp $" + .asciz "$OpenBSD: exect.S,v 1.3 1996/11/13 22:05:11 niklas Exp $" #endif /* SYSLIBC_SCCS */ LEAF(exect, 3) - SYSCALL_NOLABEL(execve) + CALLSYS_ERROR(execve) RET END(exect) diff --git a/lib/libc/arch/alpha/sys/fork.S b/lib/libc/arch/alpha/sys/fork.S index 81ed2ad030f..142458eb821 100644 --- a/lib/libc/arch/alpha/sys/fork.S +++ b/lib/libc/arch/alpha/sys/fork.S @@ -1,3 +1,6 @@ +/* $OpenBSD: fork.S,v 1.3 1996/11/13 22:05:12 niklas Exp $ */ +/* $NetBSD: fork.S,v 1.1 1995/02/10 17:50:34 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: fork.S,v 1.2 1996/08/19 08:11:08 tholo Exp $" + .asciz "$OpenBSD: fork.S,v 1.3 1996/11/13 22:05:12 niklas Exp $" #endif /* SYSLIBC_SCCS */ SYSCALL(fork) diff --git a/lib/libc/arch/alpha/sys/pipe.S b/lib/libc/arch/alpha/sys/pipe.S index 845d4f1c043..2b00573f925 100644 --- a/lib/libc/arch/alpha/sys/pipe.S +++ b/lib/libc/arch/alpha/sys/pipe.S @@ -1,3 +1,6 @@ +/* $OpenBSD: pipe.S,v 1.3 1996/11/13 22:05:12 niklas Exp $ */ +/* $NetBSD: pipe.S,v 1.1 1995/02/10 17:50:35 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: pipe.S,v 1.2 1996/08/19 08:11:10 tholo Exp $" + .asciz "$OpenBSD: pipe.S,v 1.3 1996/11/13 22:05:12 niklas Exp $" #endif /* SYSLIBC_SCCS */ SYSCALL(pipe) diff --git a/lib/libc/arch/alpha/sys/ptrace.S b/lib/libc/arch/alpha/sys/ptrace.S index 4e2604567d9..7a9cfa83ce7 100644 --- a/lib/libc/arch/alpha/sys/ptrace.S +++ b/lib/libc/arch/alpha/sys/ptrace.S @@ -1,3 +1,6 @@ +/* $OpenBSD: ptrace.S,v 1.3 1996/11/13 22:05:12 niklas Exp $ */ +/* $NetBSD: ptrace.S,v 1.3 1996/10/17 03:08:19 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,13 +32,14 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: ptrace.S,v 1.2 1996/08/19 08:11:11 tholo Exp $" + .asciz "$OpenBSD: ptrace.S,v 1.3 1996/11/13 22:05:12 niklas Exp $" #endif /* SYSLIBC_SCCS */ IMPORT(errno, 4) LEAF(ptrace, 4) + LDGP(pv) stl zero, errno - SYSCALL_NOLABEL(ptrace) + CALLSYS_ERROR(ptrace) RET END(ptrace) diff --git a/lib/libc/arch/alpha/sys/reboot.S b/lib/libc/arch/alpha/sys/reboot.S index 92e4a247d49..0bf5da831ee 100644 --- a/lib/libc/arch/alpha/sys/reboot.S +++ b/lib/libc/arch/alpha/sys/reboot.S @@ -1,3 +1,6 @@ +/* $OpenBSD: reboot.S,v 1.3 1996/11/13 22:05:13 niklas Exp $ */ +/* $NetBSD: reboot.S,v 1.1 1995/02/10 17:50:37 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:11:13 tholo Exp $" + .asciz "$OpenBSD: reboot.S,v 1.3 1996/11/13 22:05:13 niklas Exp $" #endif /* SYSLIBC_SCCS */ SYSCALL(reboot) diff --git a/lib/libc/arch/alpha/sys/sbrk.S b/lib/libc/arch/alpha/sys/sbrk.S index 06e8b747335..7b3d7abd7e2 100644 --- a/lib/libc/arch/alpha/sys/sbrk.S +++ b/lib/libc/arch/alpha/sys/sbrk.S @@ -1,3 +1,6 @@ +/* $OpenBSD: sbrk.S,v 1.4 1996/11/13 22:05:13 niklas Exp $ */ +/* $NetBSD: sbrk.S,v 1.4 1996/10/17 03:08:20 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sbrk.S,v 1.3 1996/08/19 08:11:14 tholo Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.4 1996/11/13 22:05:13 niklas Exp $" #endif /* SYSLIBC_SCCS */ .globl _end @@ -40,11 +43,11 @@ EXPORT(curbrk) .text LEAF(sbrk, 1) - br pv, 1f /* XXX profiling */ -1: SETGP(pv) + br pv, L1 /* XXX profiling */ +L1: LDGP(pv) ldq a1, curbrk addq a0, a1, a0 - SYSCALL_NOLABEL(break) + CALLSYS_ERROR(break) stq a0, curbrk mov a1, v0 RET diff --git a/lib/libc/arch/alpha/sys/setlogin.S b/lib/libc/arch/alpha/sys/setlogin.S index e2230571c2a..449142a779e 100644 --- a/lib/libc/arch/alpha/sys/setlogin.S +++ b/lib/libc/arch/alpha/sys/setlogin.S @@ -1,3 +1,6 @@ +/* $OpenBSD: setlogin.S,v 1.3 1996/11/13 22:05:14 niklas Exp $ */ +/* $NetBSD: setlogin.S,v 1.1 1995/02/10 17:50:39 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: setlogin.S,v 1.2 1996/08/19 08:11:15 tholo Exp $" + .asciz "$OpenBSD: setlogin.S,v 1.3 1996/11/13 22:05:14 niklas Exp $" #endif /* SYSLIBC_SCCS */ IMPORT(__logname_valid, 4) /* in getlogin() */ diff --git a/lib/libc/arch/alpha/sys/sigpending.S b/lib/libc/arch/alpha/sys/sigpending.S index f57d184fb33..b13c191471a 100644 --- a/lib/libc/arch/alpha/sys/sigpending.S +++ b/lib/libc/arch/alpha/sys/sigpending.S @@ -1,3 +1,6 @@ +/* $OpenBSD: sigpending.S,v 1.3 1996/11/13 22:05:14 niklas Exp $ */ +/* $NetBSD: sigpending.S,v 1.1 1995/02/10 17:50:40 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigpending.S,v 1.2 1996/08/19 08:11:16 tholo Exp $" + .asciz "$OpenBSD: sigpending.S,v 1.3 1996/11/13 22:05:14 niklas Exp $" #endif /* SYSLIBC_SCCS */ SYSCALL(sigpending) diff --git a/lib/libc/arch/alpha/sys/sigprocmask.S b/lib/libc/arch/alpha/sys/sigprocmask.S index 4ac7f5190eb..b74ccfb9079 100644 --- a/lib/libc/arch/alpha/sys/sigprocmask.S +++ b/lib/libc/arch/alpha/sys/sigprocmask.S @@ -1,3 +1,6 @@ +/* $OpenBSD: sigprocmask.S,v 1.3 1996/11/13 22:05:15 niklas Exp $ */ +/* $NetBSD: sigprocmask.S,v 1.2 1996/10/17 03:08:21 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigprocmask.S,v 1.2 1996/08/19 08:11:18 tholo Exp $" + .asciz "$OpenBSD: sigprocmask.S,v 1.3 1996/11/13 22:05:15 niklas Exp $" #endif /* SYSLIBC_SCCS */ LEAF(sigprocmask, 3) @@ -37,11 +40,10 @@ LEAF(sigprocmask, 3) cmoveq a1, 1, a0 /* if set == NULL, how = SIG_BLOCK */ beq a1, Ldoit /* and set = 0, and do it. */ ldl a1, 0(a1) /* load the set from *set */ -Ldoit: SYSCALL_NOLABEL(sigprocmask) +Ldoit: CALLSYS_ERROR(sigprocmask) beq a5, Lret /* if they don't want old mask, done */ stl v0, 0(a5) /* otherwise, give it to them. */ Lret: mov zero, v0 RET END(sigprocmask) - diff --git a/lib/libc/arch/alpha/sys/sigreturn.S b/lib/libc/arch/alpha/sys/sigreturn.S index 899f6fdfed0..ec08be54196 100644 --- a/lib/libc/arch/alpha/sys/sigreturn.S +++ b/lib/libc/arch/alpha/sys/sigreturn.S @@ -1,3 +1,6 @@ +/* $OpenBSD: sigreturn.S,v 1.3 1996/11/13 22:05:15 niklas Exp $ */ +/* $NetBSD: sigreturn.S,v 1.1 1995/02/10 17:50:42 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigreturn.S,v 1.2 1996/08/19 08:11:19 tholo Exp $" + .asciz "$OpenBSD: sigreturn.S,v 1.3 1996/11/13 22:05:15 niklas Exp $" #endif /* SYSLIBC_SCCS */ /* diff --git a/lib/libc/arch/alpha/sys/sigsuspend.S b/lib/libc/arch/alpha/sys/sigsuspend.S index f240397bd8f..0d4717e098d 100644 --- a/lib/libc/arch/alpha/sys/sigsuspend.S +++ b/lib/libc/arch/alpha/sys/sigsuspend.S @@ -1,3 +1,6 @@ +/* $OpenBSD: sigsuspend.S,v 1.3 1996/11/13 22:05:16 niklas Exp $ */ +/* $NetBSD: sigsuspend.S,v 1.2 1996/10/17 03:08:22 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,12 +32,12 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigsuspend.S,v 1.2 1996/08/19 08:11:20 tholo Exp $" + .asciz "$OpenBSD: sigsuspend.S,v 1.3 1996/11/13 22:05:16 niklas Exp $" #endif /* SYSLIBC_SCCS */ LEAF(sigsuspend, 1) ldl a0, 0(a0) /* pass *mask instead of mask */ - SYSCALL_NOLABEL(sigsuspend) + CALLSYS_ERROR(sigsuspend) mov zero, v0 /* shouldn't need; just in case... */ RET END(sigsuspend) diff --git a/lib/libc/arch/alpha/sys/syscall.S b/lib/libc/arch/alpha/sys/syscall.S index 23ad862f2cd..1faa379c3f7 100644 --- a/lib/libc/arch/alpha/sys/syscall.S +++ b/lib/libc/arch/alpha/sys/syscall.S @@ -1,3 +1,6 @@ +/* $OpenBSD: syscall.S,v 1.3 1996/11/13 22:05:16 niklas Exp $ */ +/* $NetBSD: syscall.S,v 1.1 1995/02/10 17:50:44 cgd Exp $ */ + /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. @@ -29,7 +32,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: syscall.S,v 1.2 1996/08/19 08:11:21 tholo Exp $" + .asciz "$OpenBSD: syscall.S,v 1.3 1996/11/13 22:05:16 niklas Exp $" #endif /* SYSLIBC_SCCS */ RSYSCALL(syscall) |