diff options
author | peter <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-03-11 11:29:42 +0000 |
commit | e0e06d68d52707cbac25844a417ab6919613e9eb (patch) | |
tree | 21479b686e8fe46544082e319ecfa70f9bd25fc6 /lib/libc/i386 | |
parent | 53b81178e2d0aa56f51f680543678a3d7ef8aecd (diff) | |
download | FreeBSD-src-e0e06d68d52707cbac25844a417ab6919613e9eb.zip FreeBSD-src-e0e06d68d52707cbac25844a417ab6919613e9eb.tar.gz |
Import CSRG 4.4BSD-Lite2 lib/libc onto vendor branch
Diffstat (limited to 'lib/libc/i386')
-rw-r--r-- | lib/libc/i386/gen/_setjmp.S | 20 | ||||
-rw-r--r-- | lib/libc/i386/gen/alloca.S | 6 | ||||
-rw-r--r-- | lib/libc/i386/gen/fabs.S | 6 | ||||
-rw-r--r-- | lib/libc/i386/gen/modf.S | 7 | ||||
-rw-r--r-- | lib/libc/i386/gen/setjmp.S | 25 | ||||
-rw-r--r-- | lib/libc/i386/stdlib/abs.S | 7 | ||||
-rw-r--r-- | lib/libc/i386/string/bzero.S | 97 | ||||
-rw-r--r-- | lib/libc/i386/sys/Ovfork.S | 16 | ||||
-rw-r--r-- | lib/libc/i386/sys/brk.S | 32 | ||||
-rw-r--r-- | lib/libc/i386/sys/cerror.S | 15 | ||||
-rw-r--r-- | lib/libc/i386/sys/exect.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/fork.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/mount.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/pipe.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/ptrace.S | 17 | ||||
-rw-r--r-- | lib/libc/i386/sys/reboot.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/sbrk.S | 30 | ||||
-rw-r--r-- | lib/libc/i386/sys/setlogin.S | 17 | ||||
-rw-r--r-- | lib/libc/i386/sys/sigpending.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/sigprocmask.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/sigreturn.S | 8 | ||||
-rw-r--r-- | lib/libc/i386/sys/sigsuspend.S | 6 | ||||
-rw-r--r-- | lib/libc/i386/sys/syscall.S | 10 |
23 files changed, 111 insertions, 264 deletions
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S index 7aa3e69..47e319a 100644 --- a/lib/libc/i386/gen/_setjmp.S +++ b/lib/libc/i386/gen/_setjmp.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,8 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" - .align 2,0x90 + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ /* @@ -45,7 +44,7 @@ * _longjmp(a,v) * will generate a "return(v)" from the last call to * _setjmp(a) - * by restoring registers from the environment 'a'. + * by restoring registers from the stack. * The previous signal state is NOT restored. */ @@ -60,8 +59,7 @@ ENTRY(_setjmp) movl %ebp,12(%eax) movl %esi,16(%eax) movl %edi,20(%eax) - fnstcw 28(%eax) - xorl %eax,%eax + movl $0,%eax ret ENTRY(_longjmp) @@ -73,10 +71,8 @@ ENTRY(_longjmp) movl 12(%edx),%ebp movl 16(%edx),%esi movl 20(%edx),%edi - fninit - fldcw 28(%edx) - testl %eax,%eax - jnz 1f - incl %eax + cmpl $0,%eax + jne 1f + movl $1,%eax 1: movl %ecx,0(%esp) ret diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S index 65378f5..a2d6a41 100644 --- a/lib/libc/i386/gen/alloca.S +++ b/lib/libc/i386/gen/alloca.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" + .asciz "@(#)alloca.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ /* like alloc, but automatic automatic free in return */ diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S index 2519e8b..40e72c8 100644 --- a/lib/libc/i386/gen/fabs.S +++ b/lib/libc/i386/gen/fabs.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)fabs.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)fabs.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S index 246729f..2551237 100644 --- a/lib/libc/i386/gen/modf.S +++ b/lib/libc/i386/gen/modf.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Sean Eric Fagan. @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)modf.s 5.5 (Berkeley) 3/18/91" + .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ /* @@ -49,7 +49,6 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ .text .globl _modf -.type _modf,@function _modf: pushl %ebp movl %esp,%ebp diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S index d9fc66e..b24da11 100644 --- a/lib/libc/i386/gen/setjmp.S +++ b/lib/libc/i386/gen/setjmp.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,8 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" - .align 2,0x90 + .asciz "@(#)setjmp.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ /* @@ -45,16 +44,15 @@ * longjmp(a,v) * will generate a "return(v)" from the last call to * setjmp(a) - * by restoring registers from the environment 'a'. + * by restoring registers from the stack. * The previous signal state is restored. */ #include "DEFS.h" -#include "SYS.h" ENTRY(setjmp) pushl $0 - call PIC_PLT(_sigblock) + call _sigblock popl %edx movl 4(%esp),%ecx movl 0(%esp),%edx @@ -65,14 +63,13 @@ ENTRY(setjmp) movl %esi,16(%ecx) movl %edi,20(%ecx) movl %eax,24(%ecx) - fnstcw 28(%ecx) - xorl %eax,%eax + movl $0,%eax ret ENTRY(longjmp) movl 4(%esp),%edx pushl 24(%edx) - call PIC_PLT(_sigsetmask) /* XXX this is not reentrant */ + call _sigsetmask popl %eax movl 4(%esp),%edx movl 8(%esp),%eax @@ -82,10 +79,8 @@ ENTRY(longjmp) movl 12(%edx),%ebp movl 16(%edx),%esi movl 20(%edx),%edi - fninit - fldcw 28(%edx) - testl %eax,%eax - jnz 1f - incl %eax + cmpl $0,%eax + jne 1f + movl $1,%eax 1: movl %ecx,0(%esp) ret diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S index 3122fcb..755ea56 100644 --- a/lib/libc/i386/stdlib/abs.S +++ b/lib/libc/i386/stdlib/abs.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,8 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) - .text - .asciz "@(#)abs.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)abs.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S index 7e0dcdc..79a5a69 100644 --- a/lib/libc/i386/string/bzero.S +++ b/lib/libc/i386/string/bzero.S @@ -1,6 +1,9 @@ -/* - * Copyright (c) 1993 Winning Strategies, Inc. - * All rights reserved. +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,75 +15,39 @@ * 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 Winning Strategies, Inc. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software withough 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. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * $Id: bzero.S,v 1.1 1993/12/05 13:01:42 ats Exp $ + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. */ -#if defined(LIBC_RCS) && !defined(lint) - .asciz "$Id: bzero.S,v 1.1 1993/12/05 13:01:42 ats Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)bzero.s 8.1 (Berkeley) 6/4/93" +#endif /* LIBC_SCCS and not lint */ -#include "DEFS.h" +/* bzero (base,cnt) */ -/* - * bzero (void *b, size_t len) - * write len zero bytes to the string b. - * - * Written by: - * J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc. - */ - -ENTRY(bzero) + .globl _bzero +_bzero: pushl %edi - pushl %ebx - movl 12(%esp),%edi - movl 16(%esp),%ecx - - cld /* set fill direction forward */ - xorl %eax,%eax /* set fill data to 0 */ - - /* - * if the string is too short, it's really not worth the overhead - * of aligning to word boundries, etc. So we jump to a plain - * unaligned set. - */ - cmpl $0x0f,%ecx - jle L1 - - movl %edi,%edx /* compute misalignment */ - negl %edx - andl $3,%edx - movl %ecx,%ebx - subl %edx,%ebx - - movl %edx,%ecx /* zero until word aligned */ + movl 8(%esp),%edi + movl 12(%esp),%ecx + movb $0x00,%al + cld rep stosb - - movl %ebx,%ecx /* zero by words */ - shrl $2,%ecx - rep - stosl - - movl %ebx,%ecx - andl $3,%ecx /* zero remainder by bytes */ -L1: rep - stosb - - popl %ebx popl %edi ret diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S index 181dae5..c7e6b8a 100644 --- a/lib/libc/i386/sys/Ovfork.S +++ b/lib/libc/i386/sys/Ovfork.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: Ovfork.S,v 1.3 1994/02/21 05:19:08 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)Ovfork.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -51,7 +49,6 @@ */ .set vfork,66 .globl _vfork -.type _vfork,@function _vfork: popl %ecx /* my rta into ecx */ @@ -64,14 +61,7 @@ vforkok: jmp parent .globl _errno verror: -#ifdef PIC - PIC_PROLOGUE - movl PIC_GOT(_errno), %edx - movl %eax,(%edx) - PIC_EPILOGUE -#else movl %eax,_errno -#endif movl $-1,%eax jmp %ecx child: diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S index e884ac2..f85186c 100644 --- a/lib/libc/i386/sys/brk.S +++ b/lib/libc/i386/sys/brk.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: brk.S,v 1.3 1994/02/21 05:13:26 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)brk.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)brk.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -50,29 +48,6 @@ ENTRY(_brk) jmp ok ENTRY(brk) -#ifdef PIC - movl 4(%esp),%eax - PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx # set up GOT addressing - movl PIC_GOT(minbrk),%ecx # - cmpl %eax,(%ecx) - PIC_EPILOGUE - jl ok - movl (%ecx),%eax - movl %eax,4(%esp) -ok: - lea SYS_brk,%eax - LCALL(7,0) - jb err - movl 4(%esp),%eax - movl %eax,(%edx) - movl $0,%eax - ret -err: - jmp PIC_PLT(cerror) - -#else - movl 4(%esp),%eax cmpl %eax,minbrk jl ok @@ -88,4 +63,3 @@ ok: ret err: jmp cerror -#endif diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S index 27fec0a..cc2d82f 100644 --- a/lib/libc/i386/sys/cerror.S +++ b/lib/libc/i386/sys/cerror.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,25 +32,16 @@ * 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. - * - * $Id: cerror.S,v 1.2 1994/02/21 05:19:09 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)cerror.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" .globl _errno cerror: -#ifdef PIC - PIC_PROLOGUE - movl PIC_GOT(_errno),%ecx - movl %eax,(%ecx) - PIC_EPILOGUE -#else movl %eax,_errno -#endif movl $-1,%eax ret diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S index 1739760..6b42cf8 100644 --- a/lib/libc/i386/sys/exect.S +++ b/lib/libc/i386/sys/exect.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: exect.S,v 1.2 1994/02/21 05:19:10 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)exect.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)exect.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/fork.S b/lib/libc/i386/sys/fork.S index 15b7c46..ff4d948 100644 --- a/lib/libc/i386/sys/fork.S +++ b/lib/libc/i386/sys/fork.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: fork.S,v 1.2 1994/02/21 05:19:11 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)fork.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)fork.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/mount.S b/lib/libc/i386/sys/mount.S index e0366db..ac418f7 100644 --- a/lib/libc/i386/sys/mount.S +++ b/lib/libc/i386/sys/mount.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: mount.S,v 1.2 1994/02/21 05:19:12 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)mount.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)mount.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S index 2aeae58..6469397 100644 --- a/lib/libc/i386/sys/pipe.S +++ b/lib/libc/i386/sys/pipe.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: pipe.S,v 1.2 1994/02/21 05:19:13 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)pipe.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)pipe.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S index 6137098..98994ea 100644 --- a/lib/libc/i386/sys/ptrace.S +++ b/lib/libc/i386/sys/ptrace.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,26 +32,17 @@ * 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. - * - * $Id: ptrace.S,v 1.2 1994/02/21 05:19:14 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)ptrace.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)ptrace.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" ENTRY(ptrace) xorl %eax,%eax -#ifdef PIC - PIC_PROLOGUE - movl PIC_GOT(_errno),%edx - movl %eax,(%edx) - PIC_EPILOGUE -#else - movl %eax,_errno -#endif + movl %eax,_errno lea SYS_ptrace,%eax LCALL(7,0) jb err diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S index 47e2f0a..020bea0 100644 --- a/lib/libc/i386/sys/reboot.S +++ b/lib/libc/i386/sys/reboot.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: reboot.S,v 1.2 1994/02/21 05:19:15 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)reboot.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)reboot.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S index fef35cb..7fecd93 100644 --- a/lib/libc/i386/sys/sbrk.S +++ b/lib/libc/i386/sys/sbrk.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: sbrk.S,v 1.2 1994/02/21 05:19:16 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sbrk.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)sbrk.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -54,27 +52,6 @@ curbrk: .long _end .text ENTRY(sbrk) -#ifdef PIC - movl 4(%esp),%ecx - PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx - movl (%edx),%eax - PIC_EPILOGUE - addl %eax,4(%esp) - lea SYS_brk,%eax - LCALL(7,0) - jb err - PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx - movl (%edx),%eax - addl %ecx,(%edx) - PIC_EPILOGUE - ret -err: - jmp PIC_PLT(cerror) - -#else - movl 4(%esp),%ecx movl curbrk,%eax addl %eax,4(%esp) @@ -86,4 +63,3 @@ err: ret err: jmp cerror -#endif diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S index 92d761a..43d31d7 100644 --- a/lib/libc/i386/sys/setlogin.S +++ b/lib/libc/i386/sys/setlogin.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: setlogin.S,v 1.2 1994/02/21 05:19:17 rgrimes Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)setlogin.s 5.2 (Berkeley) 4/12/91" + .asciz "@(#)setlogin.s 8.1 (Berkeley) 6/4/93" #endif /* LIBC_SCCS and not lint */ #include "SYS.h" @@ -45,14 +43,5 @@ .globl __logname_valid /* in getlogin() */ SYSCALL(setlogin) -#ifdef PIC - PIC_PROLOGUE - pushl %eax - movl PIC_GOT(__logname_valid),%eax - movl $0,(%eax) - popl %eax - PIC_EPILOGUE -#else movl $0,__logname_valid -#endif ret /* setlogin(name) */ diff --git a/lib/libc/i386/sys/sigpending.S b/lib/libc/i386/sys/sigpending.S index 4318b6d..63b06a2 100644 --- a/lib/libc/i386/sys/sigpending.S +++ b/lib/libc/i386/sys/sigpending.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: sigpending.S,v 1.2 1994/02/21 05:19:19 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigpending.s 5.1 (Berkeley) 7/1/90" + .asciz "@(#)sigpending.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigprocmask.S b/lib/libc/i386/sys/sigprocmask.S index ce929a0..ef91e80 100644 --- a/lib/libc/i386/sys/sigprocmask.S +++ b/lib/libc/i386/sys/sigprocmask.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: sigprocmask.S,v 1.2 1994/02/21 05:19:20 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigprocmask.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)sigprocmask.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S index b98c950..1bd6a3b 100644 --- a/lib/libc/i386/sys/sigreturn.S +++ b/lib/libc/i386/sys/sigreturn.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: sigreturn.S,v 1.2 1994/02/21 05:19:21 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigreturn.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)sigreturn.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigsuspend.S b/lib/libc/i386/sys/sigsuspend.S index 1db4c1a..afbc1ba 100644 --- a/lib/libc/i386/sys/sigsuspend.S +++ b/lib/libc/i386/sys/sigsuspend.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -35,7 +35,7 @@ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)sigsuspend.s 5.2 (Berkeley) 12/17/90" + .asciz "@(#)sigsuspend.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S index 37d1804..189f4dd 100644 --- a/lib/libc/i386/sys/syscall.S +++ b/lib/libc/i386/sys/syscall.S @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -32,12 +32,10 @@ * 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. - * - * $Id: syscall.S,v 1.2 1994/02/21 05:19:22 rgrimes Exp $ */ #if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90" + .asciz "@(#)syscall.s 8.1 (Berkeley) 6/4/93" #endif /* SYSLIBC_SCCS and not lint */ #include "SYS.h" @@ -47,8 +45,6 @@ ENTRY(syscall) pop %eax /* syscall number */ push %ecx LCALL(7,0) - push %ecx /* need to push a word to keep stack frame intact - upon return; the word must be the return address. */ jb 1f ret 1: |