Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libc Move IDs into .ident
details: https://anonhg.NetBSD.org/src/rev/b6bdd6b27438
branches: trunk
changeset: 761347:b6bdd6b27438
user: matt <matt%NetBSD.org@localhost>
date: Tue Jan 25 02:38:15 2011 +0000
description:
Move IDs into .ident
Use END(x)
Remove a.out support
Make CERROR hidden
diffstat:
lib/libc/arch/vax/SYS.h | 21 ++++----
lib/libc/arch/vax/gen/__setjmp14.S | 50 ++------------------
lib/libc/arch/vax/gen/__sigsetjmp14.S | 11 ++--
lib/libc/arch/vax/gen/_setjmp.S | 45 ++----------------
lib/libc/arch/vax/gen/alloca.S | 7 +-
lib/libc/arch/vax/gen/byte_swap_2.S | 7 +-
lib/libc/arch/vax/gen/byte_swap_4.S | 7 +-
lib/libc/arch/vax/gen/fabs.S | 7 +-
lib/libc/arch/vax/gen/ldexp.S | 32 +++++-------
lib/libc/arch/vax/gen/modf.S | 8 ++-
lib/libc/arch/vax/gen/swapcontext.S | 7 ++-
lib/libc/arch/vax/genassym.cf | 5 +-
lib/libc/arch/vax/string/bcmp.S | 7 ++-
lib/libc/arch/vax/string/bcopy.S | 13 +++--
lib/libc/arch/vax/string/bzero.S | 14 +++--
lib/libc/arch/vax/string/ffs.S | 10 ++-
lib/libc/arch/vax/string/index.S | 7 ++-
lib/libc/arch/vax/string/memcmp.S | 7 ++-
lib/libc/arch/vax/sys/__clone.S | 7 ++-
lib/libc/arch/vax/sys/__sigtramp3.S | 7 ++-
lib/libc/arch/vax/sys/__syscall.S | 7 +-
lib/libc/arch/vax/sys/__vfork14.S | 7 +-
lib/libc/arch/vax/sys/brk.S | 7 +-
lib/libc/arch/vax/sys/cerror.S | 9 ++-
lib/libc/arch/vax/sys/execl.S | 7 ++-
lib/libc/arch/vax/sys/execle.S | 7 ++-
lib/libc/arch/vax/sys/execlp.S | 7 ++-
lib/libc/arch/vax/sys/exect.S | 9 ++-
lib/libc/arch/vax/sys/fork.S | 7 +-
lib/libc/arch/vax/sys/getcontext.S | 7 ++-
lib/libc/arch/vax/sys/pipe.S | 11 ++--
lib/libc/arch/vax/sys/ptrace.S | 7 +-
lib/libc/arch/vax/sys/sbrk.S | 7 +-
lib/libc/arch/vax/sys/syscall.S | 7 +-
lib/libc/compat/arch/vax/sys/compat_Ovfork.S | 7 +-
lib/libc/compat/arch/vax/sys/compat___sigreturn14.S | 6 +-
lib/libc/compat/arch/vax/sys/compat___sigtramp2.S | 8 ++-
lib/libc/compat/arch/vax/sys/compat_sigpending13.S | 7 +-
lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S | 7 +-
lib/libc/compat/arch/vax/sys/compat_sigreturn13.S | 6 +-
lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S | 9 ++-
41 files changed, 222 insertions(+), 213 deletions(-)
diffs (truncated from 1280 to 300 lines):
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/SYS.h
--- a/lib/libc/arch/vax/SYS.h Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/SYS.h Tue Jan 25 02:38:15 2011 +0000
@@ -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
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/gen/__setjmp14.S
--- a/lib/libc/arch/vax/gen/__setjmp14.S Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/gen/__setjmp14.S Tue Jan 25 02:38:15 2011 +0000
@@ -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)
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/gen/__sigsetjmp14.S
--- a/lib/libc/arch/vax/gen/__sigsetjmp14.S Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/gen/__sigsetjmp14.S Tue Jan 25 02:38:15 2011 +0000
@@ -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)
-
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/gen/_setjmp.S
--- a/lib/libc/arch/vax/gen/_setjmp.S Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/gen/_setjmp.S Tue Jan 25 02:38:15 2011 +0000
@@ -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)
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/gen/alloca.S
--- a/lib/libc/arch/vax/gen/alloca.S Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/gen/alloca.S Tue Jan 25 02:38:15 2011 +0000
@@ -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)
diff -r 57de8fef72b2 -r b6bdd6b27438 lib/libc/arch/vax/gen/byte_swap_2.S
--- a/lib/libc/arch/vax/gen/byte_swap_2.S Tue Jan 25 02:37:35 2011 +0000
+++ b/lib/libc/arch/vax/gen/byte_swap_2.S Tue Jan 25 02:38:15 2011 +0000
@@ -27,13 +27,13 @@
* SUCH DAMAGE.
*/
+#include "DEFS.h"
+
Home |
Main Index |
Thread Index |
Old Index