Module Name: src
Committed By: matt
Date: Tue Aug 18 06:58:55 UTC 2009
Modified Files:
src/lib/libc/compat/arch/mips/gen [matt-nb5-mips64]: compat_sigsetjmp.S
src/lib/libc/compat/arch/mips/sys [matt-nb5-mips64]: compat_Ovfork.S
compat___semctl.S compat___sigreturn14.S compat___sigtramp1.S
compat_msgctl.S compat_shmctl.S compat_sigaction.S
compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S
compat_sigsuspend.S
Log Message:
Adapt to be ABI agnostic. Fix RCSIDs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.34.1 \
src/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S
cvs rdiff -u -r1.1 -r1.1.34.1 \
src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S \
src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S \
src/lib/libc/compat/arch/mips/sys/compat_sigpending.S \
src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S \
src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S \
src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S
cvs rdiff -u -r1.2 -r1.2.14.1 \
src/lib/libc/compat/arch/mips/sys/compat___semctl.S \
src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S \
src/lib/libc/compat/arch/mips/sys/compat_msgctl.S \
src/lib/libc/compat/arch/mips/sys/compat_shmctl.S \
src/lib/libc/compat/arch/mips/sys/compat_sigaction.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/compat/arch/mips/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S:1.1 src/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S Tue Aug 18 06:58:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_sigsetjmp.S,v 1.1.34.1 2009/08/18 06:58:54 matt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1995,
@@ -33,18 +33,18 @@
*/
#include <sys/syscall.h>
-#include <mips/regnum.h>
#include <mips/asm.h>
-#include <machine/setjmp.h>
+#include <mips/regdef.h>
+
+#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_sigsetjmp.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
- .abicalls
+#else
+ ASMSTR("$NetBSD: compat_sigsetjmp.S,v 1.1.34.1 2009/08/18 06:58:54 matt Exp $")
#endif
+#endif /* LIBC_SCCS and not lint */
/*
* C library -- sigsetjmp, siglongjmp
@@ -59,30 +59,25 @@
*/
LEAF(sigsetjmp)
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
- sw a1, (_JBLEN*4)(a0) # save "savemask"
+ SETUP_GP
+ SETUP_GP64(t0, sigsetjmp)
+ INT_S a1, _OFFSETOF_SC_MASK13(a0) # save "savemask"
bne a1, 0x0, 1f # do saving of signal mask?
- la t9, _setjmp
- jr t9
+ la t9, _C_LABEL(_setjmp)
+ jr t9
-1: la t9, setjmp
- jr t9
+1: la t9, _C_LABEL(setjmp)
+ jr t9
END(sigsetjmp)
LEAF(siglongjmp)
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
- lw t0, (_JBLEN * 4)(a0) # get "savemask"
- bne t0, 0x0, 1f # restore signal mask?
- la t9, _longjmp
+ SETUP_GP
+ SETUP_GP64(t0, siglongjmp)
+ INT_L t1, _OFFSETOF_SC_MASK13(a0) # get "savemask"
+ bne t1, 0x0, 1f # restore signal mask?
+ la t9, _C_LABEL(_longjmp)
jr t9
-1: la t9, longjmp
+
+1: la t9, _C_LABEL(longjmp)
jr t9
END(siglongjmp)
Index: src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S:1.1 src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat_Ovfork.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_Ovfork.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)Ovfork.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)Ovfork.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat_Ovfork.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
WARN_REFERENCES(vfork, \
@@ -50,19 +53,16 @@
*/
LEAF(vfork)
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
- li v0, SYS_vfork # system call number for vfork
- syscall
+ PIC_PROLOGUE(vfork)
+
+ SYSTRAP(vfork) # system call number for vfork
beq a3, zero, 1f # jump if no errors
- la t9, __cerror
- jr t9
+
+ PIC_TAILCALL(__cerror)
+
1:
beq v1, zero, 2f # parent process ?
move v0, zero # return zero in child
2:
- j ra
+ PIC_RETURN()
END(vfork)
Index: src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S
diff -u src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S:1.1 src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___sigreturn14.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat___sigreturn14.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)sigreturn.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat___sigreturn14.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)sigreturn.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat___sigreturn14.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
/*
Index: src/lib/libc/compat/arch/mips/sys/compat_sigpending.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_sigpending.S:1.1 src/lib/libc/compat/arch/mips/sys/compat_sigpending.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat_sigpending.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat_sigpending.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigpending.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_sigpending.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -33,28 +33,28 @@
*/
#include "SYS.h"
+#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)sigpending.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_sigpending.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)sigpending.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat_sigpending.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
WARN_REFERENCES(sigpending, \
"warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
LEAF(sigpending)
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
- li v0, SYS_compat_13_sigpending13
- syscall
+ PIC_PROLOGUE(sigpending)
+
+ SYSTRAP(compat_13_sigpending13)
bne a3, zero, 1f
- sw v0, 0(a0)
+ INT_S v0, _OFFSETOF_SC_ONSTACK(a0)
move v0, zero
- j ra
+ PIC_RETURN()
+
1:
- la t9, _C_LABEL(__cerror)
- jr t9
+ PIC_TAILCALL(__cerror)
END(sigpending)
Index: src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S:1.1 src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigprocmask.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_sigprocmask.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,34 +35,32 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)sigprocmask.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_sigprocmask.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)sigprocmask.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat_sigprocmask.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
WARN_REFERENCES(sigprocmask, \
"warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
LEAF(sigprocmask) # sigprocmask(how, new, old) sigset_t *new, *old;
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
+ PIC_PROLOGUE(sigprocmask)
bne a1, zero, gotptr # if new sigset pointer not null
li a0, 1 # how = SIG_BLOCK
b doit # mask = zero
gotptr:
- lw a1, 0(a1) # indirect to new mask arg
+ INT_L a1, 0(a1) # indirect to new mask arg
doit:
- li v0, SYS_compat_13_sigprocmask13
- syscall
+ SYSTRAP(compat_13_sigprocmask13)
+
bne a3, zero, err
beq a2, zero, out # test if old mask requested
- sw v0, 0(a2) # store old mask
+ INT_S v0, 0(a2) # store old mask
out:
move v0, zero
- j ra
+ PIC_RETURN()
err:
- la t9, _C_LABEL(__cerror)
- jr t9
+ PIC_TAILCALL(__cerror)
END(sigprocmask)
Index: src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S:1.1 src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat_sigreturn.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigreturn.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_sigreturn.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)sigreturn.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_sigreturn.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)sigreturn.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat_sigreturn.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
/*
Index: src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S:1.1 src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S:1.1.34.1
--- src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S:1.1 Sat Sep 17 11:49:39 2005
+++ src/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsuspend.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $ */
+/* $NetBSD: compat_sigsuspend.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,26 +35,24 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- ASMSTR("from: @(#)sigsuspend.s 8.1 (Berkeley) 6/4/93")
- ASMSTR("$NetBSD: compat_sigsuspend.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
+#if 0
+ RCSID("from: @(#)sigsuspend.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: compat_sigsuspend.S,v 1.1.34.1 2009/08/18 06:58:55 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
WARN_REFERENCES(sigsuspend, \
"warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
LEAF(sigsuspend)
-#ifdef __ABICALLS__
- .set noreorder
- .cpload t9
- .set reorder
-#endif
- lw a0, 0(a0) # indirect to mask arg
- li v0, SYS_compat_13_sigsuspend13
- syscall
+ PIC_PROLOGUE(sigsuspend)
+
+ INT_L a0, 0(a0) # indirect to mask arg
+ SYSTRAP(compat_13_sigsuspend13)
bne a3, zero, 1f
move v0, zero # should not happen
- j ra
+ PIC_RETURN()
1:
- la t9, _C_LABEL(__cerror)
- jr t9
+ PIC_TAILCALL(__cerror)
END(sigsuspend)
Index: src/lib/libc/compat/arch/mips/sys/compat___semctl.S
diff -u src/lib/libc/compat/arch/mips/sys/compat___semctl.S:1.2 src/lib/libc/compat/arch/mips/sys/compat___semctl.S:1.2.14.1
--- src/lib/libc/compat/arch/mips/sys/compat___semctl.S:1.2 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/compat/arch/mips/sys/compat___semctl.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: compat___semctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,4 +32,8 @@
#include "SYS.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ RCSID("$NetBSD: compat___semctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
PSEUDO(__semctl,compat_14___semctl)
Index: src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S
diff -u src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S:1.2 src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S:1.2.14.1
--- src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S:1.2 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___sigtramp1.S,v 1.2 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: compat___sigtramp1.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,6 +31,10 @@
#include "SYS.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ RCSID("$NetBSD: compat___sigtramp1.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
/*
* The MIPS signal trampoline is invoked only to return from
* the signal; the kernel calls the signal handler directly.
Index: src/lib/libc/compat/arch/mips/sys/compat_msgctl.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_msgctl.S:1.2 src/lib/libc/compat/arch/mips/sys/compat_msgctl.S:1.2.14.1
--- src/lib/libc/compat/arch/mips/sys/compat_msgctl.S:1.2 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/compat/arch/mips/sys/compat_msgctl.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: compat_msgctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#include "SYS.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ RCSID("$NetBSD: compat_msgctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
WARN_REFERENCES(msgctl, \
"warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
Index: src/lib/libc/compat/arch/mips/sys/compat_shmctl.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_shmctl.S:1.2 src/lib/libc/compat/arch/mips/sys/compat_shmctl.S:1.2.14.1
--- src/lib/libc/compat/arch/mips/sys/compat_shmctl.S:1.2 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/compat/arch/mips/sys/compat_shmctl.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: compat_shmctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#include "SYS.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ RCSID("$NetBSD: compat_shmctl.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
WARN_REFERENCES(shmctl, \
"warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
Index: src/lib/libc/compat/arch/mips/sys/compat_sigaction.S
diff -u src/lib/libc/compat/arch/mips/sys/compat_sigaction.S:1.2 src/lib/libc/compat/arch/mips/sys/compat_sigaction.S:1.2.14.1
--- src/lib/libc/compat/arch/mips/sys/compat_sigaction.S:1.2 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/compat/arch/mips/sys/compat_sigaction.S Tue Aug 18 06:58:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: compat_sigaction.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#include "SYS.h"
+#if defined(LIBC_SCCS) && !defined(lint)
+ RCSID("$NetBSD: compat_sigaction.S,v 1.2.14.1 2009/08/18 06:58:55 matt Exp $")
+#endif /* LIBC_SCCS and not lint */
+
WARN_REFERENCES(sigaction, \
"warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
