[src/trunk]: src/sys/arch/pmax/stand/common Add hazard nops required by MIPS1...

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

details:   https://anonhg.NetBSD.org/src/rev/be433d78966f
branches:  trunk
changeset: 760664:be433d78966f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Mon Jan 10 16:43:29 2011 +0000

description:
Add hazard nops required by MIPS1 in noreorder case.
(Umm, is it easier to remove noreorder and all BDslot insns?)

diffstat:

 sys/arch/pmax/stand/common/bootinit.S    |  3 ++-
 sys/arch/pmax/stand/common/bootread.S    |  3 ++-
 sys/arch/pmax/stand/common/clear_cache.S |  3 ++-
 sys/arch/pmax/stand/common/getchar.S     |  3 ++-
 sys/arch/pmax/stand/common/printf.S      |  3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diffs (85 lines):

diff -r 8905385922e8 -r be433d78966f sys/arch/pmax/stand/common/bootinit.S
--- a/sys/arch/pmax/stand/common/bootinit.S     Mon Jan 10 16:42:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/bootinit.S     Mon Jan 10 16:43:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinit.S,v 1.6 2011/01/10 15:25:15 tsutsui Exp $     */
+/*     $NetBSD: bootinit.S,v 1.7 2011/01/10 16:43:29 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
        .set    noreorder
 LEAF(bootinit)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
+       nop
        lw      v0, 0x54(v0)    # offset for callv->_bootinit
        nop
        j       v0              # call PROM bootinit
diff -r 8905385922e8 -r be433d78966f sys/arch/pmax/stand/common/bootread.S
--- a/sys/arch/pmax/stand/common/bootread.S     Mon Jan 10 16:42:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/bootread.S     Mon Jan 10 16:43:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootread.S,v 1.6 2011/01/10 15:25:15 tsutsui Exp $     */
+/*     $NetBSD: bootread.S,v 1.7 2011/01/10 16:43:29 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
        .set    noreorder
 LEAF(bootread)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
+       nop
        lw      v0, 0x58(v0)    # offset for callv->_bootread
        nop
        j       v0              # call PROM bootread
diff -r 8905385922e8 -r be433d78966f sys/arch/pmax/stand/common/clear_cache.S
--- a/sys/arch/pmax/stand/common/clear_cache.S  Mon Jan 10 16:42:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/clear_cache.S  Mon Jan 10 16:43:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clear_cache.S,v 1.7 2011/01/10 15:25:15 tsutsui Exp $  */
+/*     $NetBSD: clear_cache.S,v 1.8 2011/01/10 16:43:29 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
        .set    noreorder
 LEAF(clear_cache)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
+       nop
        lw      v0, 0x7c(v0)    # offset for callv->_clear_cache
        nop
        j       v0              # call PROM clear_cache
diff -r 8905385922e8 -r be433d78966f sys/arch/pmax/stand/common/getchar.S
--- a/sys/arch/pmax/stand/common/getchar.S      Mon Jan 10 16:42:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/getchar.S      Mon Jan 10 16:43:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getchar.S,v 1.3 2011/01/10 15:25:15 tsutsui Exp $      */
+/*     $NetBSD: getchar.S,v 1.4 2011/01/10 16:43:29 tsutsui Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
        .set    noreorder
 LEAF(getchar)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
+       nop
        lw      v0, 0x24(v0)    # offset for callv->_getchar
        nop
        j       v0              # call PROM getchar
diff -r 8905385922e8 -r be433d78966f sys/arch/pmax/stand/common/printf.S
--- a/sys/arch/pmax/stand/common/printf.S       Mon Jan 10 16:42:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/printf.S       Mon Jan 10 16:43:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printf.S,v 1.7 2011/01/10 15:25:15 tsutsui Exp $       */
+/*     $NetBSD: printf.S,v 1.8 2011/01/10 16:43:29 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
        .set    noreorder
 LEAF(printf)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
+       nop
        lw      t9, 0x30(v0)    # offset for callv->_printf
        nop
 #ifdef __mips_n32