[src/trunk]: src/sys/arch remove extra NOPs because "bf" and "bt" instruction...

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

details:   https://anonhg.NetBSD.org/src/rev/4afbdf96e69a
branches:  trunk
changeset: 487398:4afbdf96e69a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jun 07 05:28:17 2000 +0000

description:
remove extra NOPs because "bf" and "bt" instruction have no delayed slot.

diffstat:

 sys/arch/evbsh3/evbsh3/locore.s |  18 +-----------------
 sys/arch/mmeye/mmeye/locore.s   |   5 +----
 2 files changed, 2 insertions(+), 21 deletions(-)

diffs (170 lines):

diff -r c371cfedf5af -r 4afbdf96e69a sys/arch/evbsh3/evbsh3/locore.s
--- a/sys/arch/evbsh3/evbsh3/locore.s   Wed Jun 07 04:59:28 2000 +0000
+++ b/sys/arch/evbsh3/evbsh3/locore.s   Wed Jun 07 05:28:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.16 2000/05/31 05:06:48 thorpej Exp $      */
+/*     $NetBSD: locore.s,v 1.17 2000/06/07 05:28:18 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1997
@@ -81,7 +81,6 @@
        and     r15, r9         ; \
        cmp/eq  r8, r9          ; \
        bt      1f              ; /* If already kernel mode then jump */ \
-       nop                     ; \
        ldc     r15, r2_bank    ; \
        mov.l   3f, r8          ; /* 3f = Kernel Stack */ \
        mov.l   @r8, r15        ; /* Change to Kernel Stack */ \
@@ -321,7 +320,6 @@
        add     #4, r3
        dt      r0              /* decrement and Test */
        bf      1b
-       nop
        /* kernel image copy end */
 
        mov.l   LXstart_in_RAM, r0
@@ -509,7 +507,6 @@
        mov     r0, r14
        tst     r0, r0
        bf      sw1
-       nop
        ESTI
 
        sleep
@@ -626,7 +623,6 @@
        mov.l   @r12, r12
        tst     r12, r12
        bt      1f
-       nop
 
        /* Save stack pointers. */
        mov     r12, r4
@@ -774,7 +770,6 @@
        stc     r0_bank, r0
        cmp/eq  r0, r8          /* linked to self (i.e. nothing queued)? */
        bf      10f
-       nop
        mov.l   XL_switch_error, r0
        jmp     @r0
        nop
@@ -849,7 +844,6 @@
        mov.l   @r0, r0
        tst     r0, r0
        bt      11f
-       nop
 
        mov     r8, r4
        add     #P_STAT, r4
@@ -861,7 +855,6 @@
        mov     #SRUN, r1
        cmp/eq  r0, r1
        bt      11f
-       nop
 
        mov.l   XL_switch_error, r0
        jmp     @r0
@@ -909,7 +902,6 @@
        /* If old process exited, don't bother. */
        tst     r12, r12
        bt      switch_exited
-       nop
 
        /*
         * Second phase: save old context.
@@ -1181,7 +1173,6 @@
        mov.l   @r0, r0
        tst     r0, r0
        bt      1f
-       nop
 
        /* If trap occurred in kernel , skip AST proc */
        mov     r15, r0
@@ -1192,7 +1183,6 @@
        shld    r2, r1
        tst     r1, r0          /* test MSB of TF_SPC */
        bf      1f
-       nop
 5:     xor     r0, r0
        mov.l   XL_astpending, r1
        mov.l   r0, @r1
@@ -1233,7 +1223,6 @@
        mov.l   XL_splimit3, r0
        cmp/hs  r15, r0
        bf      100f
-       nop
        mov.l   XL_splimit_low3, r0
        cmp/hs  r0, r15
        bf      100f
@@ -1457,7 +1446,6 @@
 
        tst     r0, r0
        bt      1f
-       nop
 
        mov.l   XL_check_ipending, r0
        jsr     @r0
@@ -1465,7 +1453,6 @@
 
        tst     r0, r0
        bf      7b
-       nop
 
 2:     /* Check for ASTs on exit to user mode. */
        ECLI
@@ -1473,7 +1460,6 @@
        mov.l   @r0, r0
        tst     r0, r0
        bt      1f
-       nop
 
        /* If trap occurred in kernel , skip AST proc */
        mov     r15, r0
@@ -1484,7 +1470,6 @@
        shld    r2, r1
        tst     r1, r0          /* test MSB of TF_SPC */
        bf      1f
-       nop
 5:     xor     r0, r0
        mov.l   XXL_astpending, r1
        mov.l   r0, @r1
@@ -1541,7 +1526,6 @@
 
        tst     r0, r0
        bt      1f
-       nop
 
        mov.l   XL_restart, r1
        mov.l   XL_Xrecurse, r0
diff -r c371cfedf5af -r 4afbdf96e69a sys/arch/mmeye/mmeye/locore.s
--- a/sys/arch/mmeye/mmeye/locore.s     Wed Jun 07 04:59:28 2000 +0000
+++ b/sys/arch/mmeye/mmeye/locore.s     Wed Jun 07 05:28:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.16 2000/05/31 05:06:52 thorpej Exp $      */
+/*     $NetBSD: locore.s,v 1.17 2000/06/07 05:28:17 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1997
@@ -85,7 +85,6 @@
        and     r15, r9         ; \
        cmp/eq  r8, r9          ; \
        bt      1f              ; /* If already kernel mode then jump */ \
-       nop                     ; \
        ldc     r15, r2_bank    ; \
        mov.l   3f, r8          ; /* 3f = Kernel Stack */ \
        mov.l   @r8, r15        ; /* Change to Kernel Stack */ \
@@ -325,7 +324,6 @@
        add     #4, r3
        dt      r0              /* decrement and Test */
        bf      1b
-       nop
        /* kernel image copy end */
 
        mov.l   LXstart_in_RAM, r0
@@ -474,7 +472,6 @@
        mov     r0, r14
        tst     r0, r0
        bf      sw1
-       nop
        ESTI
 
        sleep