summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-06-04 23:14:06 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-06-04 23:14:06 +0000
commitcb300c39ded398032bf337325c27ce2934bd6b58 (patch)
tree3af195a21d06d86fcc209bd9880eb2623f86588f /lib
parent8646ec68ba24f185a1a106726e009229c5917414 (diff)
entrieness cleanup
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/arch/hppa/SYS.h4
-rw-r--r--lib/libc/arch/hppa/gen/sigsetjmp.S8
-rw-r--r--lib/libc/arch/hppa/string/bcmp.S6
-rw-r--r--lib/libc/arch/hppa/string/bcopy.m46
-rw-r--r--lib/libc/arch/hppa/string/bzero.S8
-rw-r--r--lib/libc/arch/hppa/string/ffs.S8
-rw-r--r--lib/libc/arch/hppa/string/strlcpy.S6
-rw-r--r--lib/libc/arch/hppa/sys/Ovfork.S6
-rw-r--r--lib/libc/arch/hppa/sys/brk.S6
-rw-r--r--lib/libc/arch/hppa/sys/fork.S6
-rw-r--r--lib/libc/arch/hppa/sys/sbrk.S6
-rw-r--r--lib/libc/arch/hppa/sys/sigpending.S6
-rw-r--r--lib/libc/arch/hppa/sys/sigprocmask.S6
-rw-r--r--lib/libc/arch/hppa/sys/sigsuspend.S6
14 files changed, 46 insertions, 42 deletions
diff --git a/lib/libc/arch/hppa/SYS.h b/lib/libc/arch/hppa/SYS.h
index a5703631bb3..3d1e948faab 100644
--- a/lib/libc/arch/hppa/SYS.h
+++ b/lib/libc/arch/hppa/SYS.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: SYS.h,v 1.6 2001/03/29 01:43:51 mickey Exp $ */
+/* $OpenBSD: SYS.h,v 1.7 2001/06/04 23:14:01 mickey Exp $ */
/*
* Copyright (c) 1998-1999 Michael Shalayeff
@@ -37,7 +37,7 @@
#define _LOCORE
#include <machine/frame.h>
-#define __ENTRY(p,x) ENTRY(__CONCAT(p,x))
+#define __ENTRY(p,x) ENTRY(__CONCAT(p,x),0)
#define __EXIT(p,x) EXIT(__CONCAT(p,x))
diff --git a/lib/libc/arch/hppa/gen/sigsetjmp.S b/lib/libc/arch/hppa/gen/sigsetjmp.S
index ce0fc21f3f4..9a32480d449 100644
--- a/lib/libc/arch/hppa/gen/sigsetjmp.S
+++ b/lib/libc/arch/hppa/gen/sigsetjmp.S
@@ -1,19 +1,19 @@
-/* $OpenBSD: sigsetjmp.S,v 1.2 2001/03/29 01:43:51 mickey Exp $ */
+/* $OpenBSD: sigsetjmp.S,v 1.3 2001/06/04 23:14:01 mickey Exp $ */
#include "SYS.h"
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: sigsetjmp.S,v 1.2 2001/03/29 01:43:51 mickey Exp $"
+ .asciz "$OpenBSD: sigsetjmp.S,v 1.3 2001/06/04 23:14:01 mickey Exp $"
.align 4
#endif
-ENTRY(sigsetjmp)
+ENTRY(sigsetjmp,0)
bv r0(rp)
nop
EXIT(sigsetjmp)
-ENTRY(siglongjmp)
+ENTRY(siglongjmp,0)
bv r0(rp)
nop
EXIT(siglongjmp)
diff --git a/lib/libc/arch/hppa/string/bcmp.S b/lib/libc/arch/hppa/string/bcmp.S
index f7f4419ab7a..487bcbdb230 100644
--- a/lib/libc/arch/hppa/string/bcmp.S
+++ b/lib/libc/arch/hppa/string/bcmp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcmp.S,v 1.2 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: bcmp.S,v 1.3 2001/06/04 23:14:02 mickey Exp $ */
/*
* Copyright 1996 1995 by Open Software Foundation, Inc.
@@ -52,7 +52,7 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: bcmp.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: bcmp.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
.align 4
#endif
@@ -63,7 +63,7 @@
* vm_offset_t dst;
* int count;
*/
-ENTRY(bcmp)
+LEAF_ENTRY(bcmp)
comb,>= r0,arg2,$bcmp_exit
copy t1,t2
diff --git a/lib/libc/arch/hppa/string/bcopy.m4 b/lib/libc/arch/hppa/string/bcopy.m4
index ba56db044d8..0ebf43539b9 100644
--- a/lib/libc/arch/hppa/string/bcopy.m4
+++ b/lib/libc/arch/hppa/string/bcopy.m4
@@ -1,4 +1,4 @@
-define(_rcsid,``$OpenBSD: bcopy.m4,v 1.3 2000/01/12 00:08:41 mickey Exp $'')dnl
+define(_rcsid,``$OpenBSD: bcopy.m4,v 1.4 2001/06/04 23:14:02 mickey Exp $'')dnl
dnl
dnl
dnl This is the source file for bcopy.S, spcopy.S
@@ -205,7 +205,7 @@ ifelse(NAME, `bcopy',
.align 4
#endif
-ENTRY(memcpy)
+LEAF_ENTRY(memcpy)
ALTENTRY(memmove)
copy arg0, t1
copy arg1, arg0
@@ -239,7 +239,7 @@ ifelse(NAME, `spcopy',
*/
.import curproc, data
.import copy_on_fault, code
-ENTRY(spcopy)
+LEAF_ENTRY(spcopy)
ldw HPPA_FRAME_ARG(4)(sp), ret1
comb,>=,n r0, ret1, L(spcopy, ret)
`
diff --git a/lib/libc/arch/hppa/string/bzero.S b/lib/libc/arch/hppa/string/bzero.S
index 4dc7a83a6d5..5c43e65a93b 100644
--- a/lib/libc/arch/hppa/string/bzero.S
+++ b/lib/libc/arch/hppa/string/bzero.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: bzero.S,v 1.2 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: bzero.S,v 1.3 2001/06/04 23:14:02 mickey Exp $ */
/*
* (c) Copyright 1988 HEWLETT-PACKARD COMPANY
@@ -33,7 +33,7 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: bzero.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: bzero.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
.align 4
#endif
@@ -43,7 +43,7 @@
* vm_offset_t dst;
* int count;
*/
-ENTRY(bzero)
+LEAF_ENTRY(bzero)
comb,>=,n r0,arg1,$bzero_exit
/*
@@ -110,3 +110,5 @@ $bzero_bytes
$bzero_exit
EXIT(bzero)
+
+ .end
diff --git a/lib/libc/arch/hppa/string/ffs.S b/lib/libc/arch/hppa/string/ffs.S
index 5f30e31b27a..fac55d9fe3d 100644
--- a/lib/libc/arch/hppa/string/ffs.S
+++ b/lib/libc/arch/hppa/string/ffs.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs.S,v 1.2 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: ffs.S,v 1.3 2001/06/04 23:14:02 mickey Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1994, The University of Utah and
@@ -24,7 +24,7 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: ffs.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: ffs.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
.align 4
#endif
@@ -36,7 +36,7 @@
* are numbered as "32, 31, ... 1", 0 is returned if no bits are set.
*/
-ENTRY(ffs)
+LEAF_ENTRY(ffs)
comb,= arg0,r0,ffsdone ; If arg0 is 0
or r0,r0,ret0 ; return 0
ldi 32,ret0 ; Set return to high bit
@@ -56,3 +56,5 @@ ENTRY(ffs)
addi -1,ret0,ret0 ; subtract 1 from bitpos
ffsdone:
EXIT(ffs)
+
+ .end
diff --git a/lib/libc/arch/hppa/string/strlcpy.S b/lib/libc/arch/hppa/string/strlcpy.S
index f8b164588f8..cc26bd12cc3 100644
--- a/lib/libc/arch/hppa/string/strlcpy.S
+++ b/lib/libc/arch/hppa/string/strlcpy.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcpy.S,v 1.3 2001/03/28 18:20:11 mickey Exp $ */
+/* $OpenBSD: strlcpy.S,v 1.4 2001/06/04 23:14:03 mickey Exp $ */
/*
* Copyright (c) 1999-2001 Michael Shalayeff
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: strlcpy.S,v 1.3 2001/03/28 18:20:11 mickey Exp $"
+ .asciz "$OpenBSD: strlcpy.S,v 1.4 2001/06/04 23:14:03 mickey Exp $"
.align 4
#endif
@@ -42,7 +42,7 @@
*
* it will never be a string of 2^32, so we assume 2^31 as a max size
*/
-ENTRY(strlcpy)
+LEAF_ENTRY(strlcpy)
addi 1, arg1, ret0
subi 1, arg2, t2
diff --git a/lib/libc/arch/hppa/sys/Ovfork.S b/lib/libc/arch/hppa/sys/Ovfork.S
index cabc2537885..27fb12936a9 100644
--- a/lib/libc/arch/hppa/sys/Ovfork.S
+++ b/lib/libc/arch/hppa/sys/Ovfork.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: Ovfork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: Ovfork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,11 +35,11 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: Ovfork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: Ovfork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $"
.align 4
#endif
-ENTRY(vfork)
+ENTRY(vfork,0)
SYSCALL(vfork)
addi -1, ret1, ret1
bv r0(rp)
diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S
index 17874affbb4..6eee6c3fe6a 100644
--- a/lib/libc/arch/hppa/sys/brk.S
+++ b/lib/libc/arch/hppa/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.6 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,7 +35,7 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: brk.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $"
.align 4
#endif
@@ -47,7 +47,7 @@
minbrk
.long end
-ENTRY(brk)
+ENTRY(brk,0)
ldil L%minbrk, t1
ldw R%minbrk(t1), t2
sub,<< t2, arg0, r0
diff --git a/lib/libc/arch/hppa/sys/fork.S b/lib/libc/arch/hppa/sys/fork.S
index f72109b4a6c..471f0e9735f 100644
--- a/lib/libc/arch/hppa/sys/fork.S
+++ b/lib/libc/arch/hppa/sys/fork.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: fork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $ */
+/* $OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,11 +35,11 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: fork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
+ .asciz "$OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $"
.align 4
#endif
-ENTRY(fork)
+ENTRY(fork,0)
SYSCALL(fork)
addi -1, ret1, ret1
bv r0(rp)
diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S
index eca936e9f60..36773793a99 100644
--- a/lib/libc/arch/hppa/sys/sbrk.S
+++ b/lib/libc/arch/hppa/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.6 2001/03/29 01:43:53 mickey Exp $ */
+/* $OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,7 +35,7 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: sbrk.S,v 1.6 2001/03/29 01:43:53 mickey Exp $"
+ .asciz "$OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $"
.align 4
#endif
@@ -46,7 +46,7 @@
curbrk
.long end
-ENTRY(sbrk)
+ENTRY(sbrk,0)
ldil L%curbrk, t1
ldw R%curbrk(t1), t2
add arg0, t2, arg0
diff --git a/lib/libc/arch/hppa/sys/sigpending.S b/lib/libc/arch/hppa/sys/sigpending.S
index cbb6e1e9d3b..daa6daf6ecd 100644
--- a/lib/libc/arch/hppa/sys/sigpending.S
+++ b/lib/libc/arch/hppa/sys/sigpending.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigpending.S,v 1.5 2001/03/29 01:43:53 mickey Exp $ */
+/* $OpenBSD: sigpending.S,v 1.6 2001/06/04 23:14:05 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,11 +35,11 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: sigpending.S,v 1.5 2001/03/29 01:43:53 mickey Exp $"
+ .asciz "$OpenBSD: sigpending.S,v 1.6 2001/06/04 23:14:05 mickey Exp $"
.align 4
#endif
-ENTRY(sigpending)
+ENTRY(sigpending,0)
SYSCALL(sigpending)
ldw HPPA_FRAME_ARG(0)(sp), t1
stw ret0, 0(t1)
diff --git a/lib/libc/arch/hppa/sys/sigprocmask.S b/lib/libc/arch/hppa/sys/sigprocmask.S
index 86aee292d9a..1ef5ccb061e 100644
--- a/lib/libc/arch/hppa/sys/sigprocmask.S
+++ b/lib/libc/arch/hppa/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigprocmask.S,v 1.7 2001/03/29 01:43:53 mickey Exp $ */
+/* $OpenBSD: sigprocmask.S,v 1.8 2001/06/04 23:14:05 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,11 +35,11 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: sigprocmask.S,v 1.7 2001/03/29 01:43:53 mickey Exp $"
+ .asciz "$OpenBSD: sigprocmask.S,v 1.8 2001/06/04 23:14:05 mickey Exp $"
.align 4
#endif
-ENTRY(sigprocmask)
+ENTRY(sigprocmask,0)
/* just in case compiler forgot about this */
stw arg2, HPPA_FRAME_ARG(2)(sp)
diff --git a/lib/libc/arch/hppa/sys/sigsuspend.S b/lib/libc/arch/hppa/sys/sigsuspend.S
index 263c47f9238..4d93161985c 100644
--- a/lib/libc/arch/hppa/sys/sigsuspend.S
+++ b/lib/libc/arch/hppa/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigsuspend.S,v 1.5 2001/03/29 01:43:53 mickey Exp $ */
+/* $OpenBSD: sigsuspend.S,v 1.6 2001/06/04 23:14:05 mickey Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -35,11 +35,11 @@
#ifdef SYSLIBC_SCCS
.text
- .asciz "$OpenBSD: sigsuspend.S,v 1.5 2001/03/29 01:43:53 mickey Exp $"
+ .asciz "$OpenBSD: sigsuspend.S,v 1.6 2001/06/04 23:14:05 mickey Exp $"
.align 4
#endif
-ENTRY(sigsuspend)
+ENTRY(sigsuspend,0)
ldw 0(arg0), arg0
stw arg0, HPPA_FRAME_ARG(0)(sp)