[src/trunk]: src/sys/arch/mips/mips Another macro in a branch delay slot prob...

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

details:   https://anonhg.NetBSD.org/src/rev/f9665e93e675
branches:  trunk
changeset: 574276:f9665e93e675
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Feb 26 13:15:47 2005 +0000

description:
Another macro in a branch delay slot problem.  Pad with a nop.

Pointed out again by Izumi Tsutsui on port-mips.

diffstat:

 sys/arch/mips/mips/locore.S |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 63e85b12ce30 -r f9665e93e675 sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Sat Feb 26 13:05:08 2005 +0000
+++ b/sys/arch/mips/mips/locore.S       Sat Feb 26 13:15:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.158 2004/03/04 20:17:01 drochner Exp $    */
+/*     $NetBSD: locore.S,v 1.159 2005/02/26 13:15:47 simonb Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -251,6 +251,7 @@
        lw      t0, _C_LABEL(sched_whichqs)     # look for non-empty queue
        li      t2, -1                          # t2 = lowest bit set
        bne     t0, zero, 1f
+       nop                                     # - delay slot -
        lw      t3, _C_LABEL(mips_locoresw) + MIPSX_CPU_IDLE
        nop                                     # for r2000/r3000
        jal     ra, t3