CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 03:01:27 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: getcontext.S

Log Message:
Use assym.h


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/m68k/sys/getcontext.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/m68k/sys/getcontext.S
diff -u src/lib/libc/arch/m68k/sys/getcontext.S:1.5 src/lib/libc/arch/m68k/sys/getcontext.S:1.6
--- src/lib/libc/arch/m68k/sys/getcontext.S:1.5	Tue Jul 16 22:15:55 2013
+++ src/lib/libc/arch/m68k/sys/getcontext.S	Wed Jul 17 03:01:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcontext.S,v 1.5 2013/07/16 22:15:55 matt Exp $	*/
+/*	$NetBSD: getcontext.S,v 1.6 2013/07/17 03:01:27 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,9 +30,10 @@
  */
 
 #include "SYS.h"
+#include "assym.h"
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.5 2013/07/16 22:15:55 matt Exp $")
+	RCSID("$NetBSD: getcontext.S,v 1.6 2013/07/17 03:01:27 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 
 #ifdef WEAK_ALIAS
@@ -41,8 +42,8 @@ WEAK_ALIAS(getcontext, _getcontext)
 
 _SYSCALL(_getcontext,getcontext)
 	movl	4(%sp),%a0
-	addql	#4,96(%a0)		| adjust saved stack pointer
-	movl	(%sp),100(%a0)		| adjust saved program counter
-	clrl	36(%a0)		| arrange for return value of 0
+	addql	#4,UC_MCONTEXT_SP(%a0)	| adjust saved stack pointer
+	movl	%sp@,UC_MCONTEXT_PC(%a0)| adjust saved program counter
+	clrl	UC_MCONTEXT_D0(%a0)	| arrange for return value of 0
 	rts
 END(_getcontext)

CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jul 16 22:20:35 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: exect.S syscall.S

Log Message:
Use SYSTRAP
Use a branch for CERROR (avoid the PLT)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/sys/exect.S \
src/lib/libc/arch/m68k/sys/syscall.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/m68k/sys/exect.S
diff -u src/lib/libc/arch/m68k/sys/exect.S:1.7 src/lib/libc/arch/m68k/sys/exect.S:1.8
--- src/lib/libc/arch/m68k/sys/exect.S:1.7	Thu Aug  7 16:42:14 2003
+++ src/lib/libc/arch/m68k/sys/exect.S	Tue Jul 16 22:20:35 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: exect.S,v 1.7 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: exect.S,v 1.8 2013/07/16 22:20:35 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,11 +40,11 @@
 #if 0
 	RCSID("from: @(#)exect.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: exect.S,v 1.7 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: exect.S,v 1.8 2013/07/16 22:20:35 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 ENTRY(exect)
-	movl	#SYS_execve,%d0
-	trap	#0
-	jra	PIC_PLT(CERROR)	/* exect(file, argv, env) */
+	SYSTRAP(execve)
+	jbra	CERROR		/* exect(file, argv, env) */
+END(exect)
Index: src/lib/libc/arch/m68k/sys/syscall.S
diff -u src/lib/libc/arch/m68k/sys/syscall.S:1.7 src/lib/libc/arch/m68k/sys/syscall.S:1.8
--- src/lib/libc/arch/m68k/sys/syscall.S:1.7	Thu Aug  7 16:42:14 2003
+++ src/lib/libc/arch/m68k/sys/syscall.S	Tue Jul 16 22:20:35 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.S,v 1.7 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: syscall.S,v 1.8 2013/07/16 22:20:35 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,14 +39,13 @@
 #if 0
 	RCSID("from: @(#)syscall.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: syscall.S,v 1.7 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: syscall.S,v 1.8 2013/07/16 22:20:35 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 ENTRY(syscall)
 	clrl	%d0
 	trap	#0
-	jcs	err
+	jcc	CERROR
 	rts
-err:
-	jra	PIC_PLT(CERROR)
+END(syscall)

CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jul 16 22:19:16 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: __sigtramp2.S _lwp_getprivate.S

Log Message:
Add END(func)
Use SYSTRAP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/m68k/sys/__sigtramp2.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/_lwp_getprivate.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/m68k/sys/__sigtramp2.S
diff -u src/lib/libc/arch/m68k/sys/__sigtramp2.S:1.3 src/lib/libc/arch/m68k/sys/__sigtramp2.S:1.4
--- src/lib/libc/arch/m68k/sys/__sigtramp2.S:1.3	Tue Jul 16 20:49:42 2013
+++ src/lib/libc/arch/m68k/sys/__sigtramp2.S	Tue Jul 16 22:19:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2013/07/16 20:49:42 matt Exp $ */
+/*	$NetBSD: __sigtramp2.S,v 1.4 2013/07/16 22:19:16 matt Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ ENTRY_NOPROFILE(__sigtramp_siginfo_2)
 	movl	8(%sp),%a0	/* get pointer to ucontext */
 	movl	%a0,4(%sp)	/* put it in the argument slot */
 /* fake return address already there */
-movl#SYS_setcontext,%d0
-trap#0
+	SYSTRAP(setcontext)
 	movl	%d0,4(%sp)	/* error code */
 	SYSTRAP(exit)		/* exit */
+END(__sigtramp_siginfo_2)

Index: src/lib/libc/arch/m68k/sys/_lwp_getprivate.S
diff -u src/lib/libc/arch/m68k/sys/_lwp_getprivate.S:1.2 src/lib/libc/arch/m68k/sys/_lwp_getprivate.S:1.3
--- src/lib/libc/arch/m68k/sys/_lwp_getprivate.S:1.2	Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/m68k/sys/_lwp_getprivate.S	Tue Jul 16 22:19:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: _lwp_getprivate.S,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: _lwp_getprivate.S,v 1.3 2013/07/16 22:19:16 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,3 +33,4 @@ SYSCALL(_lwp_getprivate)
 	movl	%d0,%a0
 #endif
 	rts
+END(_lwp_getprivate)

CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jul 16 22:19:37 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: __mmap.S

Log Message:
Add END(func)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/__mmap.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/m68k/sys/__mmap.S
diff -u src/lib/libc/arch/m68k/sys/__mmap.S:1.2 src/lib/libc/arch/m68k/sys/__mmap.S:1.3
--- src/lib/libc/arch/m68k/sys/__mmap.S:1.2	Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/m68k/sys/__mmap.S	Tue Jul 16 22:19:37 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: __mmap.S,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: __mmap.S,v 1.3 2013/07/16 22:19:37 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,3 +33,4 @@ _SYSCALL(__mmap,mmap)
 	movl	%d0,%a0
 #endif
 	rts
+END(__mmap)

CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jul 16 22:16:53 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: pipe.S shmat.S

Log Message:
Add END(func)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/sys/pipe.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/shmat.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/m68k/sys/pipe.S
diff -u src/lib/libc/arch/m68k/sys/pipe.S:1.7 src/lib/libc/arch/m68k/sys/pipe.S:1.8
--- src/lib/libc/arch/m68k/sys/pipe.S:1.7	Tue Jul 16 20:49:42 2013
+++ src/lib/libc/arch/m68k/sys/pipe.S	Tue Jul 16 22:16:53 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pipe.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
+/*	$NetBSD: pipe.S,v 1.8 2013/07/16 22:16:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #if 0
 	RCSID("from: @(#)pipe.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: pipe.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
+	RCSID("$NetBSD: pipe.S,v 1.8 2013/07/16 22:16:53 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,3 +53,4 @@ _SYSCALL(_pipe,pipe)
 	movl	%d1,(%a0)
 	clrl	%d0
 	rts
+END(_pipe)

Index: src/lib/libc/arch/m68k/sys/shmat.S
diff -u src/lib/libc/arch/m68k/sys/shmat.S:1.2 src/lib/libc/arch/m68k/sys/shmat.S:1.3
--- src/lib/libc/arch/m68k/sys/shmat.S:1.2	Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/m68k/sys/shmat.S	Tue Jul 16 22:16:53 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: shmat.S,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: shmat.S,v 1.3 2013/07/16 22:16:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -33,3 +33,4 @@ SYSCALL(shmat)
 	movl	%d0,%a0
 #endif
 	rts
+END(shmat)

CVS commit: src/lib/libc/arch/m68k/sys

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jul 16 22:15:55 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/sys: __m68k_read_tp.S fork.S getcontext.S
mremap.S

Log Message:
Add END(func)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/m68k/sys/__m68k_read_tp.S
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/m68k/sys/fork.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/sys/getcontext.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/mremap.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/m68k/sys/__m68k_read_tp.S
diff -u src/lib/libc/arch/m68k/sys/__m68k_read_tp.S:1.1 src/lib/libc/arch/m68k/sys/__m68k_read_tp.S:1.2
--- src/lib/libc/arch/m68k/sys/__m68k_read_tp.S:1.1	Tue Nov 22 15:25:28 2011
+++ src/lib/libc/arch/m68k/sys/__m68k_read_tp.S	Tue Jul 16 22:15:55 2013
@@ -4,4 +4,4 @@ ENTRY(__m68k_read_tp)
 	SYSTRAP(_lwp_getprivate)
 	movl	%d0,%a0
 	rts
-	.size	__m68k_read_tp, .-__m68k_read_tp
+END(__m68k_read_tp)

Index: src/lib/libc/arch/m68k/sys/fork.S
diff -u src/lib/libc/arch/m68k/sys/fork.S:1.7 src/lib/libc/arch/m68k/sys/fork.S:1.8
--- src/lib/libc/arch/m68k/sys/fork.S:1.7	Thu Aug  7 16:42:14 2003
+++ src/lib/libc/arch/m68k/sys/fork.S	Tue Jul 16 22:15:55 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fork.S,v 1.7 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: fork.S,v 1.8 2013/07/16 22:15:55 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #if 0
 	RCSID("from: @(#)fork.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: fork.S,v 1.7 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: fork.S,v 1.8 2013/07/16 22:15:55 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -47,3 +47,4 @@ _SYSCALL(__fork,fork)
 	subql	#1,%d1	/* from 1 to 0 in child, 0 to -1 in parent */
 	andl	%d1,%d0
 	rts		/* pid = fork() */
+END(__fork)

Index: src/lib/libc/arch/m68k/sys/getcontext.S
diff -u src/lib/libc/arch/m68k/sys/getcontext.S:1.4 src/lib/libc/arch/m68k/sys/getcontext.S:1.5
--- src/lib/libc/arch/m68k/sys/getcontext.S:1.4	Tue Jul 16 20:49:42 2013
+++ src/lib/libc/arch/m68k/sys/getcontext.S	Tue Jul 16 22:15:55 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcontext.S,v 1.4 2013/07/16 20:49:42 matt Exp $	*/
+/*	$NetBSD: getcontext.S,v 1.5 2013/07/16 22:15:55 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "SYS.h"
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.4 2013/07/16 20:49:42 matt Exp $")
+	RCSID("$NetBSD: getcontext.S,v 1.5 2013/07/16 22:15:55 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 
 #ifdef WEAK_ALIAS
@@ -45,3 +45,4 @@ _SYSCALL(_getcontext,getcontext)
 	movl	(%sp),100(%a0)		| adjust saved program counter
 	clrl	36(%a0)		| arrange for return value of 0
 	rts
+END(_getcontext)

Index: src/lib/libc/arch/m68k/sys/mremap.S
diff -u src/lib/libc/arch/m68k/sys/mremap.S:1.2 src/lib/libc/arch/m68k/sys/mremap.S:1.3
--- src/lib/libc/arch/m68k/sys/mremap.S:1.2	Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/m68k/sys/mremap.S	Tue Jul 16 22:15:55 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mremap.S,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: mremap.S,v 1.3 2013/07/16 22:15:55 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,3 +33,4 @@ SYSCALL(mremap)
 	movl	%d0,%a0
 #endif
 	rts
+END(mremap)

CVS commit: src/lib/libc/arch/m68k/sys

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Oct  3 22:28:33 UTC 2009

Modified Files:
src/lib/libc/arch/m68k/sys: cerror.S

Log Message:
SystemV-R4 ABI for M68k returns pointers in %a0, so we have to make sure
that CERROR returns -1 in %a0 in addition to %d0 and %d1, to make functions
like mmap(2), mremap(2), shmat(2) or sbrk(2) return -1 in case of an error.
A side effect of this bug was a segfault caused by jemalloc, when mmap()
failed.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/m68k/sys/cerror.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/m68k/sys/cerror.S
diff -u src/lib/libc/arch/m68k/sys/cerror.S:1.14 src/lib/libc/arch/m68k/sys/cerror.S:1.15
--- src/lib/libc/arch/m68k/sys/cerror.S:1.14	Thu Aug  7 16:42:14 2003
+++ src/lib/libc/arch/m68k/sys/cerror.S	Sat Oct  3 22:28:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cerror.S,v 1.14 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: cerror.S,v 1.15 2009/10/03 22:28:33 phx Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #if 0
 	RCSID("from: @(#)cerror.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: cerror.S,v 1.14 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: cerror.S,v 1.15 2009/10/03 22:28:33 phx Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -80,4 +80,7 @@
 #endif	/* _REENTRANT */
 	movl	#-1,%d0
 	movl	#-1,%d1
+#ifdef	__SVR4_ABI__
+	movl	%d0,%a0
+#endif
 	rts