[src/trunk]: src/lib/libc/arch/sh3/sys fill delay slots (from Klaus Klein)

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3d3b0e45c8c9
branches:  trunk
changeset: 484189:3d3b0e45c8c9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Mar 27 16:27:16 2000 +0000

description:
fill delay slots (from Klaus Klein)

diffstat:

 lib/libc/arch/sh3/sys/brk.S        |  7 +++----
 lib/libc/arch/sh3/sys/cerror.S     |  9 ++++-----
 lib/libc/arch/sh3/sys/fork.S       |  7 +++----
 lib/libc/arch/sh3/sys/pipe.S       |  8 +++-----
 lib/libc/arch/sh3/sys/sbrk.S       |  7 +++----
 lib/libc/arch/sh3/sys/setlogin.S   |  7 +++----
 lib/libc/arch/sh3/sys/sigpending.S |  7 +++----
 7 files changed, 22 insertions(+), 30 deletions(-)

diffs (200 lines):

diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/brk.S
--- a/lib/libc/arch/sh3/sys/brk.S       Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/brk.S       Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brk.S,v 1.1 2000/01/05 14:07:40 msaitoh Exp $  */
+/*     $NetBSD: brk.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: brk.S,v 1.1 2000/01/05 14:07:40 msaitoh Exp $")
+       RCSID("$NetBSD: brk.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -66,9 +66,8 @@
        bf      err
        xor     r0, r0
        mov.l   Lcurbrk, r1
+       rts
        mov.l   r4, @r1
-       rts
-       nop
 err:
        mov.l   Lcerror, r1
        jmp     @r1
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/cerror.S
--- a/lib/libc/arch/sh3/sys/cerror.S    Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/cerror.S    Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cerror.S,v 1.1 2000/01/05 14:07:40 msaitoh Exp $       */
+/*     $NetBSD: cerror.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: cerror.S,v 1.1 2000/01/05 14:07:40 msaitoh Exp $")
+       RCSID("$NetBSD: cerror.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -52,9 +52,8 @@
        mov.l   L_errno, r1
        mov.l   r0,@r1
        mov     #0xff,r0
+       rts
        mov     #0xff,r1
-       rts
-       nop
 
        .align 2
-L_errno:       .long   _errno
\ No newline at end of file
+L_errno:       .long   _errno
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/fork.S
--- a/lib/libc/arch/sh3/sys/fork.S      Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/fork.S      Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fork.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $ */
+/*     $NetBSD: fork.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: fork.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $")
+       RCSID("$NetBSD: fork.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -58,9 +58,8 @@
        1: .long cerror
 3:     
        add     #0xff, r1 /* from 1 to 0 in child, 0 to -1 in parent */
+       rts             /* pid = fork(); */
        and     r1,r0
-       rts             /* pid = fork(); */
-       nop
 
 #if 0
 SYSCALL(fork)
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/pipe.S
--- a/lib/libc/arch/sh3/sys/pipe.S      Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/pipe.S      Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pipe.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $ */
+/*     $NetBSD: pipe.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: pipe.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $")
+       RCSID("$NetBSD: pipe.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -49,7 +49,5 @@
        mov     r4, r2
        mov.l   r0, @r2 
        mov.l   r1, @(4,r2) 
+       rts
        xor     r0, r0
-       rts
-       nop
-       
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/sbrk.S
--- a/lib/libc/arch/sh3/sys/sbrk.S      Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/sbrk.S      Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbrk.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $ */
+/*     $NetBSD: sbrk.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: sbrk.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $")
+       RCSID("$NetBSD: sbrk.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -63,9 +63,8 @@
        mov.l   Lcurbrk, r1
        mov.l   @r1, r0
        add     r0, r2
+       rts
        mov.l   r2, @r1
-       rts
-       nop
 err:
        mov.l   Lcerror, r1
        jmp     @r1
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/setlogin.S
--- a/lib/libc/arch/sh3/sys/setlogin.S  Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/setlogin.S  Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setlogin.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $     */
+/*     $NetBSD: setlogin.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $     */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: setlogin.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $")
+       RCSID("$NetBSD: setlogin.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif
 
 #include "SYS.h"
@@ -49,9 +49,8 @@
 SYSCALL(setlogin)
        xor     r0,r0
        mov.l   L___logname_valid, r1
+       rts                             /* setlogin(name) */
        mov.l   r0, @r1
-       rts                             /* setlogin(name) */
-       nop
 
        .align 2
 L___logname_valid:     .long   ___logname_valid
diff -r 624fd50ccd50 -r 3d3b0e45c8c9 lib/libc/arch/sh3/sys/sigpending.S
--- a/lib/libc/arch/sh3/sys/sigpending.S        Mon Mar 27 16:24:08 2000 +0000
+++ b/lib/libc/arch/sh3/sys/sigpending.S        Mon Mar 27 16:27:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sigpending.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $   */
+/*     $NetBSD: sigpending.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $   */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: sigpending.S,v 1.1 2000/01/05 14:07:41 msaitoh Exp $")
+       RCSID("$NetBSD: sigpending.S,v 1.2 2000/03/27 16:27:16 msaitoh Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -51,6 +51,5 @@
 _SYSCALL(sigpending,compat_13_sigpending13)
        mov     r4, r2                  # fetch pointer to...
        mov.l   r0, @r2                 # store old mask
+       rts
        xor     r0, r0
-       rts
-       nop