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

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

details:   https://anonhg.NetBSD.org/src/rev/21b6700d7bca
branches:  netbsd-1-6
changeset: 529749:21b6700d7bca
user:      he <he%NetBSD.org@localhost>
date:      Thu Dec 12 15:45:18 2002 +0000

description:
Pull up revision 1.4 (requested by thorpej in ticket #1032):
  Revert the effects of the previous pull-up, it has undesireable
  and unintended side-effects.

diffstat:

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

diffs (35 lines):

diff -r d6f4cdc4cf85 -r 21b6700d7bca sys/arch/vax/boot/common/srt0.S
--- a/sys/arch/vax/boot/common/srt0.S   Wed Dec 11 18:29:13 2002 +0000
+++ b/sys/arch/vax/boot/common/srt0.S   Thu Dec 12 15:45:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srt0.S,v 1.2.4.1 2002/12/11 17:30:56 he Exp $ */
+/*     $NetBSD: srt0.S,v 1.2.4.2 2002/12/12 15:45:18 he Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -45,21 +45,19 @@
        .set    nisse,0
 
 ALTENTRY(start)
-       nop; nop
+       nop;nop;
+       movl    $_C_LABEL(start), %sp   # Probably safe place for stack
+       pushr   $0x1fff         # save for later usage
 
        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    1f              # already relocated, skip copy
+       beql    relocated       # 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