[src/trunk]: src/sys/arch/pmax/stand/common - specify .set noreorder to fill ...

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

details:   https://anonhg.NetBSD.org/src/rev/b0509a9bbcbf
branches:  trunk
changeset: 760661:b0509a9bbcbf
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Mon Jan 10 15:25:15 2011 +0000

description:
- specify .set noreorder to fill BDslots properly
- indent instructions in BDslots

diffstat:

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

diffs (113 lines):

diff -r b163e35f449d -r b0509a9bbcbf sys/arch/pmax/stand/common/bootinit.S
--- a/sys/arch/pmax/stand/common/bootinit.S     Mon Jan 10 14:19:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/bootinit.S     Mon Jan 10 15:25:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinit.S,v 1.5 2008/04/28 20:23:31 martin Exp $      */
+/*     $NetBSD: bootinit.S,v 1.6 2011/01/10 15:25:15 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
 #include <mips/cpuregs.h>
 #include <machine/dec_prom.h>
 
+       .set    noreorder
 LEAF(bootinit)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
        lw      v0, 0x54(v0)    # offset for callv->_bootinit
        nop
        j       v0              # call PROM bootinit
-       nop
+        nop
 END(bootinit)
diff -r b163e35f449d -r b0509a9bbcbf sys/arch/pmax/stand/common/bootread.S
--- a/sys/arch/pmax/stand/common/bootread.S     Mon Jan 10 14:19:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/bootread.S     Mon Jan 10 15:25:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootread.S,v 1.5 2008/04/28 20:23:31 martin Exp $      */
+/*     $NetBSD: bootread.S,v 1.6 2011/01/10 15:25:15 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
 #include <mips/cpuregs.h>
 #include <machine/dec_prom.h>
 
+       .set    noreorder
 LEAF(bootread)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
        lw      v0, 0x58(v0)    # offset for callv->_bootread
        nop
        j       v0              # call PROM bootread
-       nop
+        nop
 END(bootread)
diff -r b163e35f449d -r b0509a9bbcbf sys/arch/pmax/stand/common/clear_cache.S
--- a/sys/arch/pmax/stand/common/clear_cache.S  Mon Jan 10 14:19:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/clear_cache.S  Mon Jan 10 15:25:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clear_cache.S,v 1.6 2008/04/28 20:23:31 martin Exp $   */
+/*     $NetBSD: clear_cache.S,v 1.7 2011/01/10 15:25:15 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
 #include <mips/cpuregs.h>
 #include <machine/dec_prom.h>
 
+       .set    noreorder
 LEAF(clear_cache)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
        lw      v0, 0x7c(v0)    # offset for callv->_clear_cache
        nop
        j       v0              # call PROM clear_cache
-       nop
+        nop
 END(clear_cache)
diff -r b163e35f449d -r b0509a9bbcbf sys/arch/pmax/stand/common/getchar.S
--- a/sys/arch/pmax/stand/common/getchar.S      Mon Jan 10 14:19:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/getchar.S      Mon Jan 10 15:25:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getchar.S,v 1.2 2008/04/28 20:23:31 martin Exp $       */
+/*     $NetBSD: getchar.S,v 1.3 2011/01/10 15:25:15 tsutsui Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,10 +33,11 @@
 #include <mips/cpuregs.h>
 #include <machine/dec_prom.h>
 
+       .set    noreorder
 LEAF(getchar)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
        lw      v0, 0x24(v0)    # offset for callv->_getchar
        nop
        j       v0              # call PROM getchar
-       nop
+        nop
 END(getchar)
diff -r b163e35f449d -r b0509a9bbcbf sys/arch/pmax/stand/common/printf.S
--- a/sys/arch/pmax/stand/common/printf.S       Mon Jan 10 14:19:36 2011 +0000
+++ b/sys/arch/pmax/stand/common/printf.S       Mon Jan 10 15:25:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printf.S,v 1.6 2009/12/14 00:46:11 matt Exp $  */
+/*     $NetBSD: printf.S,v 1.7 2011/01/10 15:25:15 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
 #include <mips/cpuregs.h>
 #include <machine/dec_prom.h>
 
+       .set    noreorder
 LEAF(printf)
        lw      v0, _C_LABEL(callv)     # get pointer to call back vectors
        lw      t9, 0x30(v0)    # offset for callv->_printf
@@ -56,6 +57,6 @@
         addu   sp, sp, 48
 #else
        j       t9              # call PROM printf
-       nop
+        nop
 #endif
 END(printf)