Module Name: src
Committed By: matt
Date: Tue Aug 18 06:56:52 UTC 2009
Modified Files:
src/lib/libc/arch/mips/sys [matt-nb5-mips64]: __vfork14.S brk.S
cerror.S exect.S fork.S pipe.S ptrace.S sbrk.S syscall.S
Log Message:
Cleanup RCSIDs.
Use SYSTRAP instead li v0, SYS_*; syscall since that's what SYSTRAP does.
To generate a diff of this commit:
cvs rdiff -u -r1.5.46.1 -r1.5.46.2 src/lib/libc/arch/mips/sys/__vfork14.S \
src/lib/libc/arch/mips/sys/syscall.S
cvs rdiff -u -r1.16.46.1 -r1.16.46.2 src/lib/libc/arch/mips/sys/brk.S
cvs rdiff -u -r1.13.46.1 -r1.13.46.2 src/lib/libc/arch/mips/sys/cerror.S
cvs rdiff -u -r1.9.46.1 -r1.9.46.2 src/lib/libc/arch/mips/sys/exect.S \
src/lib/libc/arch/mips/sys/ptrace.S
cvs rdiff -u -r1.11.46.1 -r1.11.46.2 src/lib/libc/arch/mips/sys/fork.S
cvs rdiff -u -r1.11.34.1 -r1.11.34.2 src/lib/libc/arch/mips/sys/pipe.S
cvs rdiff -u -r1.16.34.1 -r1.16.34.2 src/lib/libc/arch/mips/sys/sbrk.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/mips/sys/__vfork14.S
diff -u src/lib/libc/arch/mips/sys/__vfork14.S:1.5.46.1 src/lib/libc/arch/mips/sys/__vfork14.S:1.5.46.2
--- src/lib/libc/arch/mips/sys/__vfork14.S:1.5.46.1 Sun Aug 16 03:36:02 2009
+++ src/lib/libc/arch/mips/sys/__vfork14.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: __vfork14.S,v 1.5.46.1 2009/08/16 03:36:02 matt Exp $ */
+/* $NetBSD: __vfork14.S,v 1.5.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)Ovfork.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: __vfork14.S,v 1.5.46.1 2009/08/16 03:36:02 matt Exp $")
+#if 0
+ RCSID("from: @(#)Ovfork.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: __vfork14.S,v 1.5.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
/*
Index: src/lib/libc/arch/mips/sys/syscall.S
diff -u src/lib/libc/arch/mips/sys/syscall.S:1.5.46.1 src/lib/libc/arch/mips/sys/syscall.S:1.5.46.2
--- src/lib/libc/arch/mips/sys/syscall.S:1.5.46.1 Sun Aug 16 03:36:03 2009
+++ src/lib/libc/arch/mips/sys/syscall.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.S,v 1.5.46.1 2009/08/16 03:36:03 matt Exp $ */
+/* $NetBSD: syscall.S,v 1.5.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)syscall.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: syscall.S,v 1.5.46.1 2009/08/16 03:36:03 matt Exp $")
+#if 0
+ RCSID("from: @(#)syscall.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: syscall.S,v 1.5.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
RSYSCALL(syscall)
Index: src/lib/libc/arch/mips/sys/brk.S
diff -u src/lib/libc/arch/mips/sys/brk.S:1.16.46.1 src/lib/libc/arch/mips/sys/brk.S:1.16.46.2
--- src/lib/libc/arch/mips/sys/brk.S:1.16.46.1 Sun Aug 16 03:36:02 2009
+++ src/lib/libc/arch/mips/sys/brk.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.16.46.1 2009/08/16 03:36:02 matt Exp $ */
+/* $NetBSD: brk.S,v 1.16.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCDID("from: @(#)brk.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: brk.S,v 1.16.46.1 2009/08/16 03:36:02 matt Exp $")
+#if 0
+ RCSID("from: @(#)brk.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: brk.S,v 1.16.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
.globl _C_LABEL(__minbrk)
Index: src/lib/libc/arch/mips/sys/cerror.S
diff -u src/lib/libc/arch/mips/sys/cerror.S:1.13.46.1 src/lib/libc/arch/mips/sys/cerror.S:1.13.46.2
--- src/lib/libc/arch/mips/sys/cerror.S:1.13.46.1 Sun Aug 16 03:36:02 2009
+++ src/lib/libc/arch/mips/sys/cerror.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.13.46.1 2009/08/16 03:36:02 matt Exp $ */
+/* $NetBSD: cerror.S,v 1.13.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)cerror.s 8.1 (Berkeley) 6/16/93") */
- RCSID("$NetBSD: cerror.S,v 1.13.46.1 2009/08/16 03:36:02 matt Exp $")
+#if 0
+ RCSID("from: @(#)cerror.s 8.1 (Berkeley) 6/16/93")
+#else
+ RCSID("$NetBSD: cerror.S,v 1.13.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
#ifdef _REENTRANT
Index: src/lib/libc/arch/mips/sys/exect.S
diff -u src/lib/libc/arch/mips/sys/exect.S:1.9.46.1 src/lib/libc/arch/mips/sys/exect.S:1.9.46.2
--- src/lib/libc/arch/mips/sys/exect.S:1.9.46.1 Sun Aug 16 03:36:02 2009
+++ src/lib/libc/arch/mips/sys/exect.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: exect.S,v 1.9.46.1 2009/08/16 03:36:02 matt Exp $ */
+/* $NetBSD: exect.S,v 1.9.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,8 +34,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)exect.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: exect.S,v 1.9.46.1 2009/08/16 03:36:02 matt Exp $")
+#if 0
+ RCSID("from: @(#)exect.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: exect.S,v 1.9.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
LEAF(exect)
Index: src/lib/libc/arch/mips/sys/ptrace.S
diff -u src/lib/libc/arch/mips/sys/ptrace.S:1.9.46.1 src/lib/libc/arch/mips/sys/ptrace.S:1.9.46.2
--- src/lib/libc/arch/mips/sys/ptrace.S:1.9.46.1 Sun Aug 16 03:36:03 2009
+++ src/lib/libc/arch/mips/sys/ptrace.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.S,v 1.9.46.1 2009/08/16 03:36:03 matt Exp $ */
+/* $NetBSD: ptrace.S,v 1.9.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,15 +35,18 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)ptrace.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: ptrace.S,v 1.9.46.1 2009/08/16 03:36:03 matt Exp $")
+#if 0
+ RCSID("from: @(#)ptrace.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: ptrace.S,v 1.9.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
LEAF(ptrace)
PIC_PROLOGUE(ptrace)
INT_S zero, _C_LABEL(errno) /* BOGUS */
- li v0, SYS_ptrace
- syscall
+
+ SYSTRAP(ptrace)
bne a3, zero, 1f
PIC_RETURN()
1:
Index: src/lib/libc/arch/mips/sys/fork.S
diff -u src/lib/libc/arch/mips/sys/fork.S:1.11.46.1 src/lib/libc/arch/mips/sys/fork.S:1.11.46.2
--- src/lib/libc/arch/mips/sys/fork.S:1.11.46.1 Sun Aug 16 03:36:02 2009
+++ src/lib/libc/arch/mips/sys/fork.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fork.S,v 1.11.46.1 2009/08/16 03:36:02 matt Exp $ */
+/* $NetBSD: fork.S,v 1.11.46.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,14 +35,17 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)fork.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: fork.S,v 1.11.46.1 2009/08/16 03:36:02 matt Exp $")
+#if 0
+ RCSID("from: @(#)fork.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: fork.S,v 1.11.46.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
LEAF(__fork)
PIC_PROLOGUE(__fork)
- li v0, SYS_fork # pid = fork()
- syscall
+
+ SYSTRAP(fork) # pid = fork()
bne a3, zero, 2f
beq v1, zero, 1f # v1 == 0 in parent, 1 in child
move v0, zero
Index: src/lib/libc/arch/mips/sys/pipe.S
diff -u src/lib/libc/arch/mips/sys/pipe.S:1.11.34.1 src/lib/libc/arch/mips/sys/pipe.S:1.11.34.2
--- src/lib/libc/arch/mips/sys/pipe.S:1.11.34.1 Sun Aug 16 03:36:03 2009
+++ src/lib/libc/arch/mips/sys/pipe.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pipe.S,v 1.11.34.1 2009/08/16 03:36:03 matt Exp $ */
+/* $NetBSD: pipe.S,v 1.11.34.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)pipe.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: pipe.S,v 1.11.34.1 2009/08/16 03:36:03 matt Exp $")
+#if 0
+ RCSID("from: @(#)pipe.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: pipe.S,v 1.11.34.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
#ifdef WEAK_ALIAS
@@ -45,8 +48,9 @@
LEAF(_pipe)
PIC_PROLOGUE(_pipe);
- li v0, SYS_pipe # pipe(fildes) int fildes[2];
- syscall
+
+ SYSTRAP(pipe) # pipe(fildes) int fildes[2];
+
bne a3, zero, 1f
INT_S v0, 0(a0) # store the two file descriptors
INT_S v1, 4(a0)
Index: src/lib/libc/arch/mips/sys/sbrk.S
diff -u src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.1 src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.2
--- src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.1 Sun Aug 16 03:36:03 2009
+++ src/lib/libc/arch/mips/sys/sbrk.S Tue Aug 18 06:56:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.16.34.1 2009/08/16 03:36:03 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.16.34.2 2009/08/18 06:56:52 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- /* RCSID("from: @(#)sbrk.s 8.1 (Berkeley) 6/4/93") */
- RCSID("$NetBSD: sbrk.S,v 1.16.34.1 2009/08/16 03:36:03 matt Exp $")
+#if 0
+ RCSID("from: @(#)sbrk.s 8.1 (Berkeley) 6/4/93")
+#else
+ RCSID("$NetBSD: sbrk.S,v 1.16.34.2 2009/08/18 06:56:52 matt Exp $")
+#endif
#endif /* LIBC_SCCS and not lint */
.globl _C_LABEL(__curbrk)
@@ -55,9 +58,8 @@
PIC_PROLOGUE(_sbrk)
la t0, _C_LABEL(__curbrk)
PTR_L v1, 0(t0)
- li v0, SYS_break
PTR_ADDU a0, a0, v1 # compute current break
- syscall
+ SYSTRAP(break)
bne a3, zero, 1f
move v0, v1 # return old val of curbrk from above
PTR_S a0, 0(t0) # save current val of curbrk from above
