[src/netbsd-1-6]: src/sys/arch/vax/boot/common Pull up revision 1.3 (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/95c45bde1cb0
branches:  netbsd-1-6
changeset: 529728:95c45bde1cb0
user:      he <he%NetBSD.org@localhost>
date:      Wed Dec 11 17:30:56 2002 +0000

description:
Pull up revision 1.3 (requested by thorpej in ticket #964):
  Only skip the copy if we are already relocated; always
  clear the BSS.

diffstat:

 sys/arch/vax/boot/common/srt0.S |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 599006c63041 -r 95c45bde1cb0 sys/arch/vax/boot/common/srt0.S
--- a/sys/arch/vax/boot/common/srt0.S   Wed Dec 11 17:28:43 2002 +0000
+++ b/sys/arch/vax/boot/common/srt0.S   Wed Dec 11 17:30:56 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srt0.S,v 1.2 2002/03/31 00:11:14 matt Exp $ */
+/*     $NetBSD: srt0.S,v 1.2.4.1 2002/12/11 17:30:56 he Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -45,19 +45,21 @@
        .set    nisse,0
 
 ALTENTRY(start)
-       nop;nop;
-       movl    $_C_LABEL(start), %sp   # Probably safe place for stack
-       pushr   $0x1fff         # save for later usage
+       nop; nop
 
        subl3   $_C_LABEL(start), $_C_LABEL(edata), %r0
        movab   _C_LABEL(start), %r1 # get where we are
        movl    $_C_LABEL(start), %r3 # get where we want to be
        cmpl    %r1,%r3         # are we where we want to be?
-       beql    relocated       # already relocated, skip copy
+       beql    1f              # already relocated, skip copy
        movc3   %r0,(%r1),(%r3) # copy
+1:
        subl3   $_C_LABEL(edata), $_C_LABEL(end), %r2
        movc5   $0,(%r3),$0,%r2,(%r3) # Zero bss
 
+       movl    $_C_LABEL(start), %sp   # set up boot stack
+       pushr   $0x1fff                 # save for later usage
+
        movpsl  -(%sp)
        pushl   $relocated
        rei