fix fork, brk/sbrk; rcsid embedding

15 files changed, 73 insertions, 60 deletions

diff --git a/lib/libc/arch/hppa/SYS.h b/lib/libc/arch/hppa/SYS.h
index 432db82f44a..a5703631bb3 100644
--- a/lib/libc/arch/hppa/SYS.h
+++ b/lib/libc/arch/hppa/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.5 1999/11/14 00:59:07 mickey Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.6 2001/03/29 01:43:51 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-1999 Michael Shalayeff
@@ -47,13 +47,14 @@
 	ldil	L%SYSCALLGATE, r1		!\
 	ble	4(sr7, r1)			!\
 	ldi	__CONCAT(SYS_,x), t1		!\
+	ldw	HPPA_FRAME_ERP(sr0,sp), rp	!\
 	comb,=,n r0, t1, __CONCAT(x,$noerr)	!\
 	ldil	L%errno, r1			!\
 	stw	t1, R%errno(r1)			!\
 	ldi	-1, ret0			!\
+	bv	r0(rp)				!\
 	ldi	-1, ret1			!\
-	.label	__CONCAT(x,$noerr)		!\
-	ldw HPPA_FRAME_ERP(sr0,sp), rp
+	.label	__CONCAT(x,$noerr)
 
 #define	__RSYSCALL(p,x)			!\
 __ENTRY(p,x)				!\
diff --git a/lib/libc/arch/hppa/gen/sigsetjmp.S b/lib/libc/arch/hppa/gen/sigsetjmp.S
index cfb8c040709..ce0fc21f3f4 100644
--- a/lib/libc/arch/hppa/gen/sigsetjmp.S
+++ b/lib/libc/arch/hppa/gen/sigsetjmp.S
@@ -1,7 +1,13 @@
-/*	$OpenBSD: sigsetjmp.S,v 1.1 1999/09/14 00:21:15 mickey Exp $	*/
+/*	$OpenBSD: sigsetjmp.S,v 1.2 2001/03/29 01:43:51 mickey Exp $	*/
 
 #include "SYS.h"
 
+#ifdef SYSLIBC_SCCS
+	.text
+	.asciz "$OpenBSD: sigsetjmp.S,v 1.2 2001/03/29 01:43:51 mickey Exp $"
+	.align	4
+#endif
+
 ENTRY(sigsetjmp)
 	bv	r0(rp)
 	nop
diff --git a/lib/libc/arch/hppa/string/bcmp.S b/lib/libc/arch/hppa/string/bcmp.S
index 5ab7b1ef785..f7f4419ab7a 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.1 1998/08/28 20:59:41 mickey Exp $	*/
+/*	$OpenBSD: bcmp.S,v 1.2 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -45,11 +45,17 @@
  * CSL requests users of this software to return to csl-dist@cs.utah.edu any
  * improvements that they make and grant CSL redistribution rights.
  *
- * 	Utah $Hdr: movc.s 1.26 94/12/14$
+ * 	Utah Hdr: movc.s 1.26 94/12/14
  */
 
 #include <machine/asm.h>
 
+#ifdef SYSLIBC_SCCS
+	.text
+	.asciz "$OpenBSD: bcmp.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+	.align	4
+#endif
+
 /*
  * int
  * bcmp(src, dst, count)
diff --git a/lib/libc/arch/hppa/string/bzero.S b/lib/libc/arch/hppa/string/bzero.S
index 8e403f200fa..4dc7a83a6d5 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.1 1998/08/28 20:59:42 mickey Exp $	*/
+/*	$OpenBSD: bzero.S,v 1.2 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  *  (c) Copyright 1988 HEWLETT-PACKARD COMPANY
@@ -31,6 +31,12 @@
 
 #include <machine/asm.h>
 
+#ifdef SYSLIBC_SCCS
+	.text
+	.asciz "$OpenBSD: bzero.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+	.align	4
+#endif
+
 /*
  * void 
  * bzero(dst, count)
diff --git a/lib/libc/arch/hppa/string/ffs.S b/lib/libc/arch/hppa/string/ffs.S
index 48a53eacd04..5f30e31b27a 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.1 1998/08/28 20:59:42 mickey Exp $	*/
+/*	$OpenBSD: ffs.S,v 1.2 2001/03/29 01:43:52 mickey Exp $	*/
 
 /* 
  * Copyright (c) 1990, 1991, 1992, 1994, The University of Utah and
@@ -22,6 +22,12 @@
 
 #include <machine/asm.h>
 
+#ifdef SYSLIBC_SCCS
+	.text
+	.asciz "$OpenBSD: ffs.S,v 1.2 2001/03/29 01:43:52 mickey Exp $"
+	.align	4
+#endif
+
 /*
  * ffs(bitmask)
  *
diff --git a/lib/libc/arch/hppa/sys/Ovfork.S b/lib/libc/arch/hppa/sys/Ovfork.S
index 464346e812b..cabc2537885 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.5 2000/01/24 20:43:04 mickey Exp $	*/
+/*	$OpenBSD: Ovfork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,15 +34,14 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: Ovfork.S,v 1.5 2000/01/24 20:43:04 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: Ovfork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
 	.align	4
 #endif
 
 ENTRY(vfork)
 	SYSCALL(vfork)
-	ldo	-1(ret1), ret1
+	addi	-1, ret1, ret1
 	bv	r0(rp)
 	and	ret1, ret0, ret0
 EXIT(vfork)
diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S
index beb1c47336a..17874affbb4 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.5 2000/01/25 01:54:22 mickey Exp $	*/
+/*	$OpenBSD: brk.S,v 1.6 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,17 +34,15 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: brk.S,v 1.5 2000/01/25 01:54:22 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: brk.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
 	.align	4
 #endif
 
 	.import	curbrk, data
 	.import	end, data
 
-	.space $PRIVATE$
-	.subspa $DATA$
+	.data
 	.export	minbrk, data
 minbrk
 	.long	end
@@ -52,7 +50,7 @@ minbrk
 ENTRY(brk)
 	ldil	L%minbrk, t1
 	ldw	R%minbrk(t1), t2
-	sub,>	t2, arg0, r0
+	sub,<<	t2, arg0, r0
 	copy	t2, arg0
 	stw	arg0, HPPA_FRAME_ARG(0)(sp)
 
diff --git a/lib/libc/arch/hppa/sys/exect.S b/lib/libc/arch/hppa/sys/exect.S
index e68e09e50fd..35d2814ec28 100644
--- a/lib/libc/arch/hppa/sys/exect.S
+++ b/lib/libc/arch/hppa/sys/exect.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exect.S,v 1.4 2000/01/12 00:08:41 mickey Exp $	*/
+/*	$OpenBSD: exect.S,v 1.5 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: exect.S,v 1.4 2000/01/12 00:08:41 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: exect.S,v 1.5 2001/03/29 01:43:52 mickey Exp $"
 	.align	4
 #endif
 
diff --git a/lib/libc/arch/hppa/sys/fork.S b/lib/libc/arch/hppa/sys/fork.S
index 7464013ad58..f72109b4a6c 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.5 2000/01/24 20:43:04 mickey Exp $	*/
+/*	$OpenBSD: fork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,17 +34,16 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: fork.S,v 1.5 2000/01/24 20:43:04 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: fork.S,v 1.6 2001/03/29 01:43:52 mickey Exp $"
 	.align	4
 #endif
 
 ENTRY(fork)
 	SYSCALL(fork)
-	ldo	-1(ret1), ret1
+	addi	-1, ret1, ret1
 	bv	r0(rp)
-	and	ret1, ret0, ret0
+	and	ret0, ret1, ret0
 EXIT(fork)
 
 	.end
diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S
index 493f0ad1608..eca936e9f60 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.5 2000/01/25 01:54:22 mickey Exp $	*/
+/*	$OpenBSD: sbrk.S,v 1.6 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,16 +34,14 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: sbrk.S,v 1.5 2000/01/25 01:54:22 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: sbrk.S,v 1.6 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif
 
 	.import	end, data
 
-	.space $PRIVATE$
-	.subspa $DATA$
+	.data
 	.export	curbrk, data
 curbrk
 	.long	end
@@ -51,16 +49,16 @@ curbrk
 ENTRY(sbrk)
 	ldil	L%curbrk, t1
 	ldw	R%curbrk(t1), t2
-	add	t2, arg0, arg0
+	add	arg0, t2, arg0
 	stw	arg0, HPPA_FRAME_ARG(0)(sp)
 
 	SYSCALL(break)
 
 	ldil	L%curbrk, t1
-	ldw	R%curbrk(t1), arg0
-	ldw	HPPA_FRAME_ARG(0)(sp), arg1
+	ldw	R%curbrk(t1), ret0
+	ldw	HPPA_FRAME_ARG(0)(sp), arg0
 	bv	r0(rp)
-	stw	arg1, R%curbrk(t1)
+	stw	arg0, R%curbrk(t1)
 
 EXIT(sbrk)
 
diff --git a/lib/libc/arch/hppa/sys/sigpending.S b/lib/libc/arch/hppa/sys/sigpending.S
index dc41547ab54..cbb6e1e9d3b 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.4 2000/01/12 00:08:42 mickey Exp $	*/
+/*	$OpenBSD: sigpending.S,v 1.5 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: sigpending.S,v 1.4 2000/01/12 00:08:42 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: sigpending.S,v 1.5 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif
 
diff --git a/lib/libc/arch/hppa/sys/sigprocmask.S b/lib/libc/arch/hppa/sys/sigprocmask.S
index 4d5dae1c8a2..86aee292d9a 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.6 2000/01/25 01:54:22 mickey Exp $	*/
+/*	$OpenBSD: sigprocmask.S,v 1.7 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: sigprocmask.S,v 1.6 2000/01/25 01:54:22 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: sigprocmask.S,v 1.7 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif
 
diff --git a/lib/libc/arch/hppa/sys/sigreturn.S b/lib/libc/arch/hppa/sys/sigreturn.S
index 82443ceeab7..aee44274b24 100644
--- a/lib/libc/arch/hppa/sys/sigreturn.S
+++ b/lib/libc/arch/hppa/sys/sigreturn.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigreturn.S,v 1.3 2000/01/12 00:08:42 mickey Exp $	*/
+/*	$OpenBSD: sigreturn.S,v 1.4 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 2000/01/12 00:08:42 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: sigreturn.S,v 1.4 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif
 
diff --git a/lib/libc/arch/hppa/sys/sigsuspend.S b/lib/libc/arch/hppa/sys/sigsuspend.S
index 460dc3a64a8..263c47f9238 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.4 2000/01/12 00:08:42 mickey Exp $	*/
+/*	$OpenBSD: sigsuspend.S,v 1.5 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: sigsuspend.S,v 1.4 2000/01/12 00:08:42 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: sigsuspend.S,v 1.5 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif
 
diff --git a/lib/libc/arch/hppa/sys/syscall.S b/lib/libc/arch/hppa/sys/syscall.S
index 96faaf1307f..81e119f9c95 100644
--- a/lib/libc/arch/hppa/sys/syscall.S
+++ b/lib/libc/arch/hppa/sys/syscall.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.S,v 1.3 2000/01/12 00:08:42 mickey Exp $	*/
+/*	$OpenBSD: syscall.S,v 1.4 2001/03/29 01:43:53 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -34,9 +34,8 @@
 #include "SYS.h"
 
 #ifdef SYSLIBC_SCCS
-	.space .text
-	.subspa $code$
-	.asciz "$OpenBSD: syscall.S,v 1.3 2000/01/12 00:08:42 mickey Exp $"
+	.text
+	.asciz "$OpenBSD: syscall.S,v 1.4 2001/03/29 01:43:53 mickey Exp $"
 	.align	4
 #endif