Sat May 9 08:25:34 2020 UTC ()

No need to .import __cerror as SYS.h does it


(skrll)

diff -r1.9 -r1.10 src/lib/libc/arch/hppa/sys/__vfork14.S
diff -r1.6 -r1.7 src/lib/libc/arch/hppa/sys/ptrace.S

--- src/lib/libc/arch/hppa/sys/__vfork14.S 2020/05/05 20:43:47	1.9
+++ src/lib/libc/arch/hppa/sys/__vfork14.S 2020/05/09 08:25:33	1.10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __vfork14.S,v 1.9 2020/05/05 20:43:47 skrll Exp $	*/
+/*	$NetBSD: __vfork14.S,v 1.10 2020/05/09 08:25:33 skrll Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Fredette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -42,27 +42,25 @@ ENTRY(__vfork14, 0)
 	 * So we must save values in registers, specifically,
 	 * registers that the kernel is willing to preserve
 	 * across the syscall.  Normally, this would be callee-
 	 * saved registers, with the kernel being the callee,
 	 * but the problem is that we, too, are a callee, and
 	 * would have to save that very same register somewhere,
 	 * because *our* caller is counting on us to do so.
+	 *
 	 * What we need is a normally caller-saved register,
 	 * that the kernel is willing to save for us.  The
 	 * syscall entry code in locore.S has been modified
 	 * to do just this for the t4 register.
 	 */
 	.import	__cerror, code
 	copy	%rp, %t4
 	ldil	L%SYSCALLGATE, %r1
 	ble	4(%sr2, %r1)
 	 ldi	SYS___vfork14, %t1
 	comb,=,n %r0, %t1, 1f
 	b	__cerror
 :
 	 copy	%t4, %rp		// delay slot of branch to __cerror
 	addi	-1, %ret1, %ret1
 	bv	%r0(%rp)
 	 and	%ret0, %ret1, %ret0
 EXIT(__vfork14)

--- src/lib/libc/arch/hppa/sys/ptrace.S 2008/04/28 20:22:56	1.6
+++ src/lib/libc/arch/hppa/sys/ptrace.S 2020/05/09 08:25:33	1.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptrace.S,v 1.6 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: ptrace.S,v 1.7 2020/05/09 08:25:33 skrll Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Fredette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,28 +22,26 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/errno.h>
 #include "SYS.h"
 	.import __cerror, code
 /*
  * int ptrace(int request, pid_t pid, void * addr, int data);
  */
 ENTRY(ptrace, HPPA_FRAME_SIZE)
 	stw	%rp, HPPA_FRAME_CRP(%sp)
 	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
 	stw	%arg1, HPPA_FRAME_ARG(1)(%sp)
 	stw	%arg2, HPPA_FRAME_ARG(2)(%sp)
 	stw	%arg3, HPPA_FRAME_ARG(3)(%sp)
 	ldo	HPPA_FRAME_SIZE(%sp),%sp
 	bl	__cerror, %rp
 	 copy	%r0, %t1