Module Name: src
Committed By: matt
Date: Tue Jan 25 02:38:16 UTC 2011
Modified Files:
src/lib/libc/arch/vax: SYS.h genassym.cf
src/lib/libc/arch/vax/gen: __setjmp14.S __sigsetjmp14.S _setjmp.S
alloca.S byte_swap_2.S byte_swap_4.S fabs.S ldexp.S modf.S
swapcontext.S
src/lib/libc/arch/vax/string: bcmp.S bcopy.S bzero.S ffs.S index.S
memcmp.S
src/lib/libc/arch/vax/sys: __clone.S __sigtramp3.S __syscall.S
__vfork14.S brk.S cerror.S execl.S execle.S execlp.S exect.S fork.S
getcontext.S pipe.S ptrace.S sbrk.S syscall.S
src/lib/libc/compat/arch/vax/sys: compat_Ovfork.S
compat___sigreturn14.S compat___sigtramp2.S compat_sigpending13.S
compat_sigprocmask13.S compat_sigreturn13.S compat_sigsuspend13.S
Log Message:
Move IDs into .ident
Use END(x)
Remove a.out support
Make CERROR hidden
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/vax/SYS.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/vax/genassym.cf
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/vax/gen/__setjmp14.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/vax/gen/__sigsetjmp14.S \
src/lib/libc/arch/vax/gen/byte_swap_4.S src/lib/libc/arch/vax/gen/modf.S
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/vax/gen/_setjmp.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/gen/alloca.S \
src/lib/libc/arch/vax/gen/byte_swap_2.S src/lib/libc/arch/vax/gen/fabs.S \
src/lib/libc/arch/vax/gen/swapcontext.S
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/vax/gen/ldexp.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/string/bcmp.S \
src/lib/libc/arch/vax/string/bcopy.S src/lib/libc/arch/vax/string/bzero.S \
src/lib/libc/arch/vax/string/ffs.S src/lib/libc/arch/vax/string/index.S \
src/lib/libc/arch/vax/string/memcmp.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/sys/__clone.S \
src/lib/libc/arch/vax/sys/__syscall.S src/lib/libc/arch/vax/sys/execl.S \
src/lib/libc/arch/vax/sys/execlp.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/vax/sys/__sigtramp3.S
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/vax/sys/__vfork14.S \
src/lib/libc/arch/vax/sys/exect.S src/lib/libc/arch/vax/sys/fork.S
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/vax/sys/brk.S
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/vax/sys/cerror.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/vax/sys/execle.S \
src/lib/libc/arch/vax/sys/getcontext.S src/lib/libc/arch/vax/sys/pipe.S
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/vax/sys/ptrace.S
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/vax/sys/sbrk.S
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/vax/sys/syscall.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S \
src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S \
src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S \
src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S \
src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S \
src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S \
src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/vax/SYS.h
diff -u src/lib/libc/arch/vax/SYS.h:1.10 src/lib/libc/arch/vax/SYS.h:1.11
--- src/lib/libc/arch/vax/SYS.h:1.10 Thu Aug 7 16:42:30 2003
+++ src/lib/libc/arch/vax/SYS.h Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: SYS.h,v 1.10 2003/08/07 16:42:30 agc Exp $ */
+/* $NetBSD: SYS.h,v 1.11 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,6 +33,9 @@
#include <machine/asm.h>
#include <sys/syscall.h>
+#define CERROR _C_LABEL(__cerror)
+#define CURBRK _C_LABEL(__curbrk)
+
#ifdef __STDC__
#define SYSTRAP(x) chmk $ SYS_ ## x
#else
@@ -44,6 +47,7 @@
SYSTRAP(y)
#define _SYSCALL(x,y) \
+ .p2align 2; \
err: nop; nop; jmp CERROR+2; \
_SYSCALL_NOERROR(x,y); \
jcs err+2
@@ -56,11 +60,13 @@
#define PSEUDO_NOERROR(x,y) \
_SYSCALL_NOERROR(x,y); \
- ret
+ ret; \
+ END(x)
#define PSEUDO(x,y) \
_SYSCALL(x,y); \
- ret
+ ret; \
+ END(x)
#define RSYSCALL_NOERROR(x) \
PSEUDO_NOERROR(x,x)
@@ -79,12 +85,5 @@
#define ASMSTR .asciz
-#ifdef __ELF__
-#define CERROR _C_LABEL(__cerror)
-#define CURBRK _C_LABEL(__curbrk)
-#else
-#define CERROR _ASM_LABEL(cerror)
-#define CURBRK _ASM_LABEL(curbrk)
-#endif
-
+ .hidden CERROR
.globl CERROR
Index: src/lib/libc/arch/vax/genassym.cf
diff -u src/lib/libc/arch/vax/genassym.cf:1.4 src/lib/libc/arch/vax/genassym.cf:1.5
--- src/lib/libc/arch/vax/genassym.cf:1.4 Mon Apr 28 20:22:57 2008
+++ src/lib/libc/arch/vax/genassym.cf Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.4 2008/04/28 20:22:57 martin Exp $
+# $NetBSD: genassym.cf,v 1.5 2011/01/25 02:38:15 matt Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
include <ucontext.h>
include <signal.h>
+include <errno.h>
define UC_LEN sizeof(ucontext_t)
define UC_FLAGS offsetof(ucontext_t, uc_flags)
@@ -81,3 +82,5 @@
define SIG_BLOCK SIG_BLOCK
define SS_LEN sizeof(sigset_t)
+
+define ERANGE ERANGE
Index: src/lib/libc/arch/vax/gen/__setjmp14.S
diff -u src/lib/libc/arch/vax/gen/__setjmp14.S:1.10 src/lib/libc/arch/vax/gen/__setjmp14.S:1.11
--- src/lib/libc/arch/vax/gen/__setjmp14.S:1.10 Tue May 3 04:37:33 2005
+++ src/lib/libc/arch/vax/gen/__setjmp14.S Tue Jan 25 02:38:15 2011
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- /* .asciz "@(#)setjmp.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: __setjmp14.S,v 1.10 2005/05/03 04:37:33 matt Exp $"
-#endif /* LIBC_SCCS and not lint */
-
/*
* C library -- setjmp, longjmp
*
@@ -46,6 +41,11 @@
#include "DEFS.h"
#include "assym.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ /* .asciz "@(#)setjmp.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: __setjmp14.S,v 1.11 2011/01/25 02:38:15 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
ENTRY(__setjmp14, R6)
movl 4(%ap),%r2 # construct sigcontext
subl2 $12,%sp # space for current struct sigstack
@@ -68,48 +68,10 @@
movl 16(%fp),(%r2)+ # save pc of caller
movpsl (%r2) # save current psl
movw 4(%fp),(%r2) # save psw of caller
-#ifdef __ELF__
addl3 $SC_LEN,4(%ap),%r2 # point to past signal context
movq %r6,(%r2)+ # save r6/r7
movq %r8,(%r2)+ # save r8/r9
movq %r10,(%r2)+ # save r10/r11
-#endif
clrl %r0
ret
-
-#ifndef __ELF__
-ENTRY(__longjmp14, 0)
- movl 8(%ap),%r0 # return(v)
- movl 4(%ap),%r1 # fetch buffer
- tstl 12(%r1) # is fp non-null?
- beql botch
-
-#ifdef __ELF__
- moval $SC_LEN(%r1),%r2 # get ptr to saved registers
- movq (%r2)+,%r6 # restore r6/r7
- movq (%r2)+,%r8 # restore r8/r9
- movq (%r2)+,%r10 # restore r10/r11
-#else
-loop:
- cmpl 12(%r1),%fp # are we there yet?
- beql done
- blssu botch
- moval 20(%fp),%r2
- blbc 6(%fp),1f # was %r0 saved?
- movl %r0,(%r2)+
-1:
- bbc $1,6(%fp),2f # was %r1 saved?
- movl %r1,(%r2)
-2:
- movab loop,16(%fp)
- ret # pop another frame
-
-done:
-#endif /* !__ELF__ */
- pushl %r1 # pointer to sigcontext
- calls $1,_C_LABEL(__sigreturn14) # restore previous context
- # we should never return
-botch:
- calls $0,_C_LABEL(longjmperror)
- halt
-#endif
+END(__setjmp14)
Index: src/lib/libc/arch/vax/gen/__sigsetjmp14.S
diff -u src/lib/libc/arch/vax/gen/__sigsetjmp14.S:1.4 src/lib/libc/arch/vax/gen/__sigsetjmp14.S:1.5
--- src/lib/libc/arch/vax/gen/__sigsetjmp14.S:1.4 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/__sigsetjmp14.S Tue Jan 25 02:38:15 2011
@@ -27,8 +27,11 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+#include <machine/setjmp.h>
+
#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "$NetBSD: __sigsetjmp14.S,v 1.4 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
/*
@@ -43,9 +46,6 @@
* signal mask.
*/
-#include "DEFS.h"
-#include <machine/setjmp.h>
-
ENTRY(__sigsetjmp14, R6)
movl 4(%ap),%r0 # get env pointer
movl 8(%ap),(_JBLEN*4)(%r0) # save "savemask"
@@ -53,6 +53,7 @@
beql L1
jmp _C_LABEL(__setjmp14)+2 # yep, do full setjmp
L1: jmp _C_LABEL(_setjmp)+2 # nope, skip to _setjmp
+END(__sigsetjmp14)
ENTRY(__siglongjmp14, 0)
movl 4(%ap),%r0 # get env pointer
@@ -60,5 +61,5 @@
beql L2
jmp _C_LABEL(__longjmp14)+2 # yep, do full longjmp
L2: jmp _C_LABEL(_longjmp)+2 # nope, skip to _longjmp
-
+END(__siglongjmp14)
Index: src/lib/libc/arch/vax/gen/byte_swap_4.S
diff -u src/lib/libc/arch/vax/gen/byte_swap_4.S:1.4 src/lib/libc/arch/vax/gen/byte_swap_4.S:1.5
--- src/lib/libc/arch/vax/gen/byte_swap_4.S:1.4 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/byte_swap_4.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)htonl.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: byte_swap_4.S,v 1.4 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: byte_swap_4.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
-#include "DEFS.h"
-
ALTENTRY(ntohl)
ALTENTRY(htonl)
ENTRY(__bswap32, 0)
@@ -41,3 +41,4 @@
insv %r0,$16,$8,%r0
movb 7(%ap),%r0
ret
+END(__bswap32)
Index: src/lib/libc/arch/vax/gen/modf.S
diff -u src/lib/libc/arch/vax/gen/modf.S:1.4 src/lib/libc/arch/vax/gen/modf.S:1.5
--- src/lib/libc/arch/vax/gen/modf.S:1.4 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/modf.S Tue Jan 25 02:38:15 2011
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: modf.S,v 1.4 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: modf.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
/*
@@ -40,8 +42,6 @@
* and stores the integer part indirectly through "iptr".
*/
-#include "DEFS.h"
-
ENTRY(modf, 0)
emodd 4(%ap),$0,$0f1.0,%r2,%r0
jvs 1f # integer overflow
@@ -50,6 +50,7 @@
1:
subd3 %r0,4(%ap),*12(%ap)
ret
+END(modf)
ENTRY(modff, 0)
emodf 4(%ap),$0,$0f1.0,%r2,%r0
@@ -59,3 +60,4 @@
1:
subf3 %r0,4(%ap),*8(%ap)
ret
+END(modff)
Index: src/lib/libc/arch/vax/gen/_setjmp.S
diff -u src/lib/libc/arch/vax/gen/_setjmp.S:1.9 src/lib/libc/arch/vax/gen/_setjmp.S:1.10
--- src/lib/libc/arch/vax/gen/_setjmp.S:1.9 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/_setjmp.S Tue Jan 25 02:38:15 2011
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: _setjmp.S,v 1.9 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: _setjmp.S,v 1.10 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
/*
@@ -46,13 +48,10 @@
* in order to be consistent.
*/
-#include "DEFS.h"
-
ENTRY(_setjmp, R6)
movl 4(%ap),%r0
movl 12(%fp),12(%r0) # save frame pointer of caller
movl 16(%fp),20(%r0) # save pc of caller
-#ifdef __ELF__
movl 8(%fp),16(%r0) # save ap of caller
clrl %r1 # clear arg count
bbc $13,6(%fp),1f # was this a callg?
@@ -63,16 +62,15 @@
movq %r6,44(%r0) # save r6/r7
movq %r8,52(%r0) # save r8/r9
movq %r10,60(%r0) # save r10/r11
-#endif
clrl %r0
ret
+END(_setjmp)
ENTRY(_longjmp, 0)
movl 8(%ap),%r0 # return(v)
movl 4(%ap),%r1 # fetch buffer
tstl 12(%r1) # is fp null
beql botch
-#ifdef __ELF__
movq 44(%r1),%r6 # restore r6/r7
movq 52(%r1),%r8 # restore r8/r9
movq 60(%r1),%r10 # restore r10/r11
@@ -81,41 +79,8 @@
movl 12(%r1),%fp # restore fp
movq 20(%r1),-(%sp) # save pc/psl to new stack
rei # and go back to saved pc/psl
-#else
-loop:
- bitw $1,6(%fp) # %r0 saved?
- beql 1f
- movl %r0,20(%fp)
- bitw $2,6(%fp) # was %r1 saved?
- beql 2f
- movl %r1,24(%fp)
- brb 2f
-1:
- bitw $2,6(%fp) # was %r1 saved?
- beql 2f
- movl %r1,20(%fp)
-2:
- cmpl 12(%r1),12(%fp)
- beql done
- blssu botch
- movab loop,16(%fp)
- ret # pop another frame
-
-done:
- cmpb *16(%fp),$2 # returning to an "rei"?
- bneq 1f
- movab 3f,16(%fp) # do return w/ psl-pc pop
- brw 2f
-1:
- movab 4f,16(%fp) # do standard return
-2:
- ret # unwind stack before signals enabled
-3:
- addl2 $8,%sp # compensate for PSL-PC push
-4:
- jmp *20(%r1) # done, return....
-#endif /* !__ELF__ */
botch:
calls $0,_C_LABEL(longjmperror)
halt
+END(_longjmp)
Index: src/lib/libc/arch/vax/gen/alloca.S
diff -u src/lib/libc/arch/vax/gen/alloca.S:1.3 src/lib/libc/arch/vax/gen/alloca.S:1.4
--- src/lib/libc/arch/vax/gen/alloca.S:1.3 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/alloca.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)alloca.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: alloca.S,v 1.3 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: alloca.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
-#include "DEFS.h"
-
ENTRY(alloca, 0)
movl 4(%ap),%r0 # get allocation size
movl 16(%fp),%r2 # save return address before we smash it
@@ -44,3 +44,4 @@
bicl2 $3,%sp # align to longword boundary
movl %sp,%r0
jmp (%r2)
+END(alloca)
Index: src/lib/libc/arch/vax/gen/byte_swap_2.S
diff -u src/lib/libc/arch/vax/gen/byte_swap_2.S:1.3 src/lib/libc/arch/vax/gen/byte_swap_2.S:1.4
--- src/lib/libc/arch/vax/gen/byte_swap_2.S:1.3 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/byte_swap_2.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)htons.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: byte_swap_2.S,v 1.3 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: byte_swap_2.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
-#include "DEFS.h"
-
ALTENTRY(ntohs)
ALTENTRY(htons)
ENTRY(__bswap16, 0)
@@ -41,3 +41,4 @@
movb 5(%ap),%r0
movzwl %r0,%r0
ret
+END(__bswap16)
Index: src/lib/libc/arch/vax/gen/fabs.S
diff -u src/lib/libc/arch/vax/gen/fabs.S:1.3 src/lib/libc/arch/vax/gen/fabs.S:1.4
--- src/lib/libc/arch/vax/gen/fabs.S:1.3 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/fabs.S Tue Jan 25 02:38:15 2011
@@ -27,18 +27,19 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
/* .asciz "@(#)fabs.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: fabs.S,v 1.3 2003/08/07 16:42:31 agc Exp $"
+RCSID("$NetBSD: fabs.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
/* fabs - floating absolute value */
-#include "DEFS.h"
-
ENTRY(fabs, 0)
movd 4(%ap),%r0
bgeq 1f
mnegd %r0,%r0
1:
ret
+END(fabs)
Index: src/lib/libc/arch/vax/gen/swapcontext.S
diff -u src/lib/libc/arch/vax/gen/swapcontext.S:1.3 src/lib/libc/arch/vax/gen/swapcontext.S:1.4
--- src/lib/libc/arch/vax/gen/swapcontext.S:1.3 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/arch/vax/gen/swapcontext.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.3 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: swapcontext.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,6 +31,10 @@
#include "SYS.h"
+#ifdef LIBC_SCCS
+RCSID("$NetBSD: swapcontext.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
ENTRY(swapcontext, 0)
clrl %r0 /* assume getcontext succeeds */
chmk $SYS_getcontext /* getcontext(oucp) */
@@ -48,3 +52,4 @@
pushl 8(%ap)
calls $1,_C_LABEL(setcontext) /* setcontext(ucp) */
ret
+END(swapcontext)
Index: src/lib/libc/arch/vax/gen/ldexp.S
diff -u src/lib/libc/arch/vax/gen/ldexp.S:1.6 src/lib/libc/arch/vax/gen/ldexp.S:1.7
--- src/lib/libc/arch/vax/gen/ldexp.S:1.6 Thu Aug 7 16:42:31 2003
+++ src/lib/libc/arch/vax/gen/ldexp.S Tue Jan 25 02:38:15 2011
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- /*.asciz "@(#)ldexp.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: ldexp.S,v 1.6 2003/08/07 16:42:31 agc Exp $"
-#endif /* LIBC_SCCS and not lint */
-
/*
* double ldexp (value, exp)
* double value;
@@ -46,15 +41,16 @@
*/
#include "DEFS.h"
+#include "assym.h"
-/*
- * don't include errno.h, ANSI C says it defines errno.
- *
- * #include <errno.h>
- */
-#define ERANGE 34
+#if defined(LIBC_SCCS) && !defined(lint)
+ /*.asciz "@(#)ldexp.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: ldexp.S,v 1.7 2011/01/25 02:38:15 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+#ifndef _REENTRANT
.globl _C_LABEL(errno)
+#endif
ENTRY(ldexp, 0)
movd 4(%ap),%r0 /* fetch "value" */
@@ -72,7 +68,12 @@
clrd %r0
jbr 1f
3:
- movd huge,%r0 /* largest possible floating magnitude */
+ /*
+ * The largest number that can be represented in a long floating
+ * number. This is given in hex in order to avoid floating
+ * conversions
+ */
+ movq $0x7fffffffffffffff,%r0 /* largest possible floating magnitude */
jbc $15,4(%ap),1f /* jump if argument was positive */
mnegd %r0,%r0 /* if arg < 0, make result negative */
1:
@@ -85,9 +86,4 @@
movl $ ERANGE,_C_LABEL(errno)
#endif
ret
-
- .data
-huge: .word 0x7fff /* the largest number that can */
- .word 0xffff /* be represented in a long floating */
- .word 0xffff /* number. This is given in hex in order */
- .word 0xffff /* to avoid floating conversions */
+END(ldexp)
Index: src/lib/libc/arch/vax/string/bcmp.S
diff -u src/lib/libc/arch/vax/string/bcmp.S:1.3 src/lib/libc/arch/vax/string/bcmp.S:1.4
--- src/lib/libc/arch/vax/string/bcmp.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/bcmp.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: bcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,6 +32,10 @@
#include "DEFS.h"
+#ifdef LIBC_SCCS
+RCSID("$NetBSD: bcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
/* Since "cmpc3" is not portable across VAXen, do it the hard way */
/* still, this is four times faster than the generic C version on a uvax2 */
@@ -56,3 +60,4 @@
clrl %r0 # we have a match!
9:
ret
+END(bcmp)
Index: src/lib/libc/arch/vax/string/bcopy.S
diff -u src/lib/libc/arch/vax/string/bcopy.S:1.3 src/lib/libc/arch/vax/string/bcopy.S:1.4
--- src/lib/libc/arch/vax/string/bcopy.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/bcopy.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: bcopy.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,14 +28,16 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "@(#)bcopy.s 8.1 (Berkeley) 6/4/93"
-#endif /* LIBC_SCCS and not lint */
-
/* bcopy(from, to, size) */
#include "DEFS.h"
+#if defined(LIBC_SCCS)
+ /* .asciz "@(#)bcopy.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: bcopy.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
+
ENTRY(bcopy, R6)
movl 4(%ap),%r1
movl 8(%ap),%r3
@@ -73,3 +75,4 @@
subl2 %r6,%r3
movc3 %r6,(%r1),(%r3)
ret
+END(bcopy)
Index: src/lib/libc/arch/vax/string/bzero.S
diff -u src/lib/libc/arch/vax/string/bzero.S:1.3 src/lib/libc/arch/vax/string/bzero.S:1.4
--- src/lib/libc/arch/vax/string/bzero.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/bzero.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bzero.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: bzero.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,13 +28,14 @@
* SUCH DAMAGE.
*/
-#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, length) */
+#if defined(LIBC_SCCS)
+ /* .asciz "@(#)bzero.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: bzero.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
-#include "DEFS.h"
+/* bzero(base, length) */
ENTRY(bzero, 0)
movl 4(%ap),%r3
@@ -48,3 +49,4 @@
jgtr 1b
movc5 $0,(%r3),$0,8(%ap),(%r3)
ret
+END(bzero)
Index: src/lib/libc/arch/vax/string/ffs.S
diff -u src/lib/libc/arch/vax/string/ffs.S:1.3 src/lib/libc/arch/vax/string/ffs.S:1.4
--- src/lib/libc/arch/vax/string/ffs.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/ffs.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: ffs.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,14 +28,15 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "@(#)ffs.s 8.1 (Berkeley) 6/4/93"
+ /* .asciz "@(#)ffs.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: ffs.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
#endif /* LIBC_SCCS and not lint */
/* bit = ffs(value) */
-#include "DEFS.h"
-
ENTRY(ffs, 0)
ffs $0,$32,4(%ap),%r0
bneq 1f
@@ -43,3 +44,4 @@
1:
incl %r0
ret
+END(ffs)
Index: src/lib/libc/arch/vax/string/index.S
diff -u src/lib/libc/arch/vax/string/index.S:1.3 src/lib/libc/arch/vax/string/index.S:1.4
--- src/lib/libc/arch/vax/string/index.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/index.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: index.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: index.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,6 +38,10 @@
*/
#include "DEFS.h"
+#ifdef LIBC_SCCS
+RCSID("$NetSBD$")
+#endif
+
/* Alas not quite twice as fast as the generic C version on a uvax2 */
ENTRY(index, 0)
@@ -57,3 +61,4 @@
jneq 3b
decl %r0
jbr 2b
+END(index)
Index: src/lib/libc/arch/vax/string/memcmp.S
diff -u src/lib/libc/arch/vax/string/memcmp.S:1.3 src/lib/libc/arch/vax/string/memcmp.S:1.4
--- src/lib/libc/arch/vax/string/memcmp.S:1.3 Thu Aug 7 16:42:32 2003
+++ src/lib/libc/arch/vax/string/memcmp.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memcmp.S,v 1.3 2003/08/07 16:42:32 agc Exp $ */
+/* $NetBSD: memcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,6 +32,10 @@
#include "DEFS.h"
+#ifdef LIBC_SCCS
+RCSID("$NetBSD: memcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
ENTRY(memcmp, 0)
movl 12(%ap),%r0
jeql 9f
@@ -63,3 +67,4 @@
subl3 %r4,%r3,%r0
9:
ret
+END(memcmp)
Index: src/lib/libc/arch/vax/sys/__clone.S
diff -u src/lib/libc/arch/vax/sys/__clone.S:1.3 src/lib/libc/arch/vax/sys/__clone.S:1.4
--- src/lib/libc/arch/vax/sys/__clone.S:1.3 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/arch/vax/sys/__clone.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: __clone.S,v 1.3 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: __clone.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,6 +33,10 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: __clone.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(clone, __clone)
#endif
@@ -74,3 +78,4 @@
9: movl $EINVAL,%r0
jmp CERROR+2
+END(__clone)
Index: src/lib/libc/arch/vax/sys/__syscall.S
diff -u src/lib/libc/arch/vax/sys/__syscall.S:1.3 src/lib/libc/arch/vax/sys/__syscall.S:1.4
--- src/lib/libc/arch/vax/sys/__syscall.S:1.3 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/__syscall.S Tue Jan 25 02:38:15 2011
@@ -32,13 +32,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)syscall.s 8.2 (Berkeley) 1/21/94" */
- .asciz "$NetBSD: __syscall.S,v 1.3 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: __syscall.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
ENTRY(__syscall, 0)
movl 4(%ap),%r0 # syscall number
addl2 $8,%ap # skip the first argument
@@ -48,3 +48,4 @@
ret
1:
jmp CERROR+2
+END(__syscall)
Index: src/lib/libc/arch/vax/sys/execl.S
diff -u src/lib/libc/arch/vax/sys/execl.S:1.3 src/lib/libc/arch/vax/sys/execl.S:1.4
--- src/lib/libc/arch/vax/sys/execl.S:1.3 Sun Aug 24 21:04:53 2003
+++ src/lib/libc/arch/vax/sys/execl.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execl.S,v 1.3 2003/08/24 21:04:53 ragge Exp $ */
+/* $NetBSD: execl.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -31,6 +31,10 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: execl.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(execl, _execl)
#endif
@@ -40,3 +44,4 @@
pushl 4(%ap) # Push path
calls $2,_C_LABEL(execv)
ret
+END(_execl)
Index: src/lib/libc/arch/vax/sys/execlp.S
diff -u src/lib/libc/arch/vax/sys/execlp.S:1.3 src/lib/libc/arch/vax/sys/execlp.S:1.4
--- src/lib/libc/arch/vax/sys/execlp.S:1.3 Sun Aug 24 21:04:53 2003
+++ src/lib/libc/arch/vax/sys/execlp.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execlp.S,v 1.3 2003/08/24 21:04:53 ragge Exp $ */
+/* $NetBSD: execlp.S,v 1.4 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -31,6 +31,10 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: execlp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(execlp, _execlp)
#endif
@@ -40,3 +44,4 @@
pushl 4(%ap) # Push path
calls $2,_C_LABEL(execvp)
ret
+END(_execlp)
Index: src/lib/libc/arch/vax/sys/__sigtramp3.S
diff -u src/lib/libc/arch/vax/sys/__sigtramp3.S:1.1 src/lib/libc/arch/vax/sys/__sigtramp3.S:1.2
--- src/lib/libc/arch/vax/sys/__sigtramp3.S:1.1 Tue Sep 30 19:05:41 2003
+++ src/lib/libc/arch/vax/sys/__sigtramp3.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: __sigtramp3.S,v 1.1 2003/09/30 19:05:41 matt Exp $ */
+/* $NetBSD: __sigtramp3.S,v 1.2 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 2003 Matt Thomas <[email protected]>
@@ -39,11 +39,16 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: __sigtramp3.S,v 1.2 2011/01/25 02:38:15 matt Exp $")
+#endif
+
.text
_ALIGN_TEXT
.globl _C_LABEL(__sigtramp_siginfo_3)
_C_LABEL(__sigtramp_siginfo_3):
+ nop; nop
callg (%ap),(%fp) # use global arg list
addl2 $8,%ap # arg is pointer to ucontext
SYSTRAP(setcontext) # exit from here
Index: src/lib/libc/arch/vax/sys/__vfork14.S
diff -u src/lib/libc/arch/vax/sys/__vfork14.S:1.5 src/lib/libc/arch/vax/sys/__vfork14.S:1.6
--- src/lib/libc/arch/vax/sys/__vfork14.S:1.5 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/__vfork14.S Tue Jan 25 02:38:15 2011
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)Ovfork.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: __vfork14.S,v 1.5 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: __vfork14.S,v 1.6 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
/*
@@ -37,8 +39,6 @@
* C library -- vfork
*/
-#include "SYS.h"
-
/*
* pid = vfork();
*
@@ -74,3 +74,4 @@
mnegl $1,%r0
jmp (%r2)
#endif
+END(__vfork14)
Index: src/lib/libc/arch/vax/sys/exect.S
diff -u src/lib/libc/arch/vax/sys/exect.S:1.5 src/lib/libc/arch/vax/sys/exect.S:1.6
--- src/lib/libc/arch/vax/sys/exect.S:1.5 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/exect.S Tue Jan 25 02:38:15 2011
@@ -27,15 +27,16 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+#include <machine/psl.h>
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)exect.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: exect.S,v 1.5 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: exect.S,v 1.6 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-#include <machine/psl.h>
-
ENTRY(exect, 0)
bispsw $PSL_T
chmk $ SYS_execve
jmp CERROR+2 # exect(file, argv, env)
+END(exect)
Index: src/lib/libc/arch/vax/sys/fork.S
diff -u src/lib/libc/arch/vax/sys/fork.S:1.5 src/lib/libc/arch/vax/sys/fork.S:1.6
--- src/lib/libc/arch/vax/sys/fork.S:1.5 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/fork.S Tue Jan 25 02:38:15 2011
@@ -27,15 +27,16 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)fork.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: fork.S,v 1.5 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: fork.S,v 1.6 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
_SYSCALL(__fork,fork)
jlbc %r1,1f # parent, since %r1 == 0 in parent, 1 in child
clrl %r0
1:
ret # pid = fork()
+END(__fork)
Index: src/lib/libc/arch/vax/sys/brk.S
diff -u src/lib/libc/arch/vax/sys/brk.S:1.12 src/lib/libc/arch/vax/sys/brk.S:1.13
--- src/lib/libc/arch/vax/sys/brk.S:1.12 Fri Dec 26 11:21:48 2003
+++ src/lib/libc/arch/vax/sys/brk.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)brk.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: brk.S,v 1.12 2003/12/26 11:21:48 martin Exp $"
+RCSID("$NetBSD: brk.S,v 1.13 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
.globl CURBRK
.globl _C_LABEL(__minbrk)
@@ -52,3 +52,4 @@
ret
err:
jmp CERROR+2
+END(_brk)
Index: src/lib/libc/arch/vax/sys/cerror.S
diff -u src/lib/libc/arch/vax/sys/cerror.S:1.8 src/lib/libc/arch/vax/sys/cerror.S:1.9
--- src/lib/libc/arch/vax/sys/cerror.S:1.8 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/cerror.S Tue Jan 25 02:38:15 2011
@@ -27,15 +27,15 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)cerror.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: cerror.S,v 1.8 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: cerror.S,v 1.9 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
.globl _C_LABEL(errno)
-CERROR: .word 0
+NENTRY(__cerror, 0)
#ifdef _REENTRANT
pushl %r0
calls $0,_C_LABEL(__errno)
@@ -46,3 +46,4 @@
mnegl $1,%r0
movl %r0,%r1
ret
+END(__cerror)
Index: src/lib/libc/arch/vax/sys/execle.S
diff -u src/lib/libc/arch/vax/sys/execle.S:1.4 src/lib/libc/arch/vax/sys/execle.S:1.5
--- src/lib/libc/arch/vax/sys/execle.S:1.4 Sun Aug 24 21:04:53 2003
+++ src/lib/libc/arch/vax/sys/execle.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execle.S,v 1.4 2003/08/24 21:04:53 ragge Exp $ */
+/* $NetBSD: execle.S,v 1.5 2011/01/25 02:38:15 matt Exp $ */
/*
* Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -31,6 +31,10 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: execle.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(execle, _execle)
#endif
@@ -42,3 +46,4 @@
pushl 4(%ap) # Push path
calls $3,_C_LABEL(execve)
ret
+END(_execle)
Index: src/lib/libc/arch/vax/sys/getcontext.S
diff -u src/lib/libc/arch/vax/sys/getcontext.S:1.4 src/lib/libc/arch/vax/sys/getcontext.S:1.5
--- src/lib/libc/arch/vax/sys/getcontext.S:1.4 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/arch/vax/sys/getcontext.S Tue Jan 25 02:38:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.4 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: getcontext.S,v 1.5 2011/01/25 02:38:15 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,6 +31,10 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: getcontext.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(getcontext, _getcontext)
#endif
@@ -59,3 +63,4 @@
movl %fp,(36+14*4)(%r2) /* adjust FP */
movl %r3,(36+15*4)(%r2) /* adjust PC */
jmp (%r3) /* and return */
+END(_getcontext)
Index: src/lib/libc/arch/vax/sys/pipe.S
diff -u src/lib/libc/arch/vax/sys/pipe.S:1.4 src/lib/libc/arch/vax/sys/pipe.S:1.5
--- src/lib/libc/arch/vax/sys/pipe.S:1.4 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/pipe.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
- /* .asciz "@(#)pipe.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: pipe.S,v 1.4 2003/08/07 16:42:33 agc Exp $"
-#endif /* SYSLIBC_SCCS and not lint */
-
#include "SYS.h"
+#if defined(SYSLIBC_SCCS)
+ /* .asciz "@(#)pipe.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: pipe.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
+#endif
+
#ifdef WEAK_ALIAS
WEAK_ALIAS(pipe, _pipe)
#endif
@@ -44,3 +44,4 @@
movl %r1,(%r2)
clrl %r0
ret
+END(_pipe)
Index: src/lib/libc/arch/vax/sys/ptrace.S
diff -u src/lib/libc/arch/vax/sys/ptrace.S:1.7 src/lib/libc/arch/vax/sys/ptrace.S:1.8
--- src/lib/libc/arch/vax/sys/ptrace.S:1.7 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/ptrace.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)ptrace.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: ptrace.S,v 1.7 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: ptrace.S,v 1.8 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
ENTRY(ptrace, 0)
#ifdef _REENTRANT
calls $0,_C_LABEL(__errno)
@@ -46,3 +46,4 @@
ret
err:
jmp CERROR+2
+END(ptrace)
Index: src/lib/libc/arch/vax/sys/sbrk.S
diff -u src/lib/libc/arch/vax/sys/sbrk.S:1.10 src/lib/libc/arch/vax/sys/sbrk.S:1.11
--- src/lib/libc/arch/vax/sys/sbrk.S:1.10 Thu Aug 7 16:42:33 2003
+++ src/lib/libc/arch/vax/sys/sbrk.S Tue Jan 25 02:38:15 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sbrk.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: sbrk.S,v 1.10 2003/08/07 16:42:33 agc Exp $"
+RCSID("$NetBSD: sbrk.S,v 1.11 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
.globl _end
.globl _C_LABEL(__minbrk)
.globl CURBRK
@@ -61,3 +61,4 @@
ret
err:
jmp CERROR+2
+END(_sbrk)
Index: src/lib/libc/arch/vax/sys/syscall.S
diff -u src/lib/libc/arch/vax/sys/syscall.S:1.6 src/lib/libc/arch/vax/sys/syscall.S:1.7
--- src/lib/libc/arch/vax/sys/syscall.S:1.6 Thu Aug 7 16:42:34 2003
+++ src/lib/libc/arch/vax/sys/syscall.S Tue Jan 25 02:38:15 2011
@@ -32,13 +32,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)syscall.s 8.2 (Berkeley) 1/21/94" */
- .asciz "$NetBSD: syscall.S,v 1.6 2003/08/07 16:42:34 agc Exp $"
+RCSID("$NetBSD: syscall.S,v 1.7 2011/01/25 02:38:15 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
ENTRY(syscall, 0)
movl 4(%ap),%r0 # syscall number
subl3 $1,(%ap)+,(%ap) # one fewer arguments
@@ -47,3 +47,4 @@
ret
1:
jmp CERROR+2
+END(syscall)
Index: src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S
diff -u src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S:1.1 src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat_Ovfork.S Tue Jan 25 02:38:16 2011
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)Ovfork.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat_Ovfork.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
/*
@@ -37,8 +39,6 @@
* C library -- vfork
*/
-#include "SYS.h"
-
WARN_REFERENCES(vfork, \
"warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
@@ -77,3 +77,4 @@
mnegl $1,%r0
jmp (%r2)
#endif
+END(vfork)
Index: src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S
diff -u src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S:1.1 src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S Tue Jan 25 02:38:16 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sigreturn.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat___sigreturn14.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat___sigreturn14.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
/*
* We must preserve the state of the registers as the user has set them up.
*/
Index: src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S
diff -u src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S:1.1 src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S Tue Jan 25 02:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___sigtramp2.S,v 1.1 2006/02/18 22:54:51 matt Exp $ */
+/* $NetBSD: compat___sigtramp2.S,v 1.2 2011/01/25 02:38:16 matt Exp $ */
/*
* Copyright (c) 2002 Anders Magnusson, ([email protected]).
@@ -36,14 +36,20 @@
#include "SYS.h"
+#ifdef SYSLIBC_SCCS
+RCSID("$NetBSD: compat___sigtramp2.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
+#endif
+
.text
_ALIGN_TEXT
.globl _C_LABEL(__sigtramp_sigcontext_2)
_C_LABEL(__sigtramp_sigcontext_2):
+ nop; nop;
pushr $(R0|R1|R2|R3|R4|R5) # save scratch registers
callg (%ap),(%fp) # use global arg list
popr $(R0|R1|R2|R3|R4|R5) # restore regs
movab 8(%ap),%ap # arg is pointer to sigctx
SYSTRAP(compat_16___sigreturn14) # exit from here
halt # illegal insn
+END(__sigtramp_sigcontext_t)
Index: src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S
diff -u src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S:1.1 src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat_sigpending13.S Tue Jan 25 02:38:16 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sigpending.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat_sigpending13.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat_sigpending13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
WARN_REFERENCES(sigpending, \
"warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
@@ -41,3 +41,4 @@
movl %r0,*4(%ap) # store old mask
clrl %r0
ret
+END(sigpending)
Index: src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S
diff -u src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S:1.1 src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S Tue Jan 25 02:38:16 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sigprocmask.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat_sigprocmask13.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat_sigprocmask13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
WARN_REFERENCES(sigprocmask, \
"warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
@@ -54,3 +54,4 @@
out:
clrl %r0
ret
+END(sigprocmask)
Index: src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S
diff -u src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S:1.1 src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S Tue Jan 25 02:38:16 2011
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sigreturn.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat_sigreturn13.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat_sigreturn13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
/*
* We must preserve the state of the registers as the user has set them up.
*/
Index: src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S
diff -u src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S:1.1 src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S:1.2
--- src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S:1.1 Sat Feb 18 22:54:51 2006
+++ src/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S Tue Jan 25 02:38:16 2011
@@ -27,20 +27,21 @@
* SUCH DAMAGE.
*/
+#include "SYS.h"
+
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sigsuspend.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: compat_sigsuspend13.S,v 1.1 2006/02/18 22:54:51 matt Exp $"
+RCSID("$NetBSD: compat_sigsuspend13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
-#include "SYS.h"
-
WARN_REFERENCES(sigsuspend, \
"warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
ENTRY(sigsuspend, 0)
movl *4(%ap),4(%ap) # indirect to mask arg
- chmk $ SYS_compat_13_sigsuspend13
+ SYSTRAP(compat_13_sigsuspend13)
jcc 1f
jmp CERROR+2
1: clrl %r0 # shouldnt happen
ret
+END(sigsuspend)
