[src/trunk]: src/sys/arch/arm/arm Don't VPRINTF until we have stack for our C...

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

details:   https://anonhg.NetBSD.org/src/rev/b59edae809cc
branches:  trunk
changeset: 839078:b59edae809cc
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Feb 06 14:12:25 2019 +0000

description:
Don't VPRINTF until we have stack for our CPU setup properly

diffstat:

 sys/arch/arm/arm/armv6_start.S |  34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diffs (60 lines):

diff -r 983641766973 -r b59edae809cc sys/arch/arm/arm/armv6_start.S
--- a/sys/arch/arm/arm/armv6_start.S    Wed Feb 06 14:08:50 2019 +0000
+++ b/sys/arch/arm/arm/armv6_start.S    Wed Feb 06 14:12:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armv6_start.S,v 1.5 2019/01/03 10:26:41 skrll Exp $    */
+/*     $NetBSD: armv6_start.S,v 1.6 2019/02/06 14:12:25 skrll Exp $    */
 
 /*-
  * Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -757,18 +757,6 @@
        ldr     R_VTOPDIFF, =cpu_mpstart
        sub     R_VTOPDIFF, R_VTOPDIFF, R_TMP2
 
-       ldr     R_TMP2, =start_stacks_top
-       sub     sp, R_TMP2, R_VTOPDIFF
-
-#ifdef VERBOSE_INIT_ARM
-       VPRINTF("\n\rmidr :")
-       mrc     p15, 0, r0, c0, c0, 0           // MIDR
-       VPRINTX(r0)
-       VPRINTF("\n\rmpidr:")
-       mrc     p15, 0, r0, c0, c0, 5           // MPIDR
-       VPRINTX(r0)
-#endif
-
        mrc     p15, 0, r4, c0, c0, 5           // MPIDR get
        and     r4, #(MPIDR_AFF2|MPIDR_AFF1|MPIDR_AFF0)
 
@@ -789,15 +777,27 @@
 2:
        mov     R_TMP2, r0                      // save cpu_index for later
 
-       VPRINTF("index: ")
-       VPRINTX(R_TMP2)
-       XPUTC('\n')
-       XPUTC('\r')
+       ldr     R_TMP1, =start_stacks_top
+       sub     sp, R_TMP1, R_VTOPDIFF
 
        mov     r5, R_TMP2
        lsl     r5, #INIT_ARM_STACK_SHIFT
        sub     sp, sp, r5
 
+#ifdef VERBOSE_INIT_ARM
+       VPRINTF("\n\rmidr  : ")
+       mrc     p15, 0, r0, c0, c0, 0           // MIDR
+       VPRINTX(r0)
+       VPRINTF("\n\rrevidr: ")
+       mrc     p15, 0, r0, c0, c0, 6           // REVIDR
+       VPRINTX(r0)
+       VPRINTF("\n\rmpidr : ")
+       mrc     p15, 0, r0, c0, c0, 5           // MPIDR
+       VPRINTX(r0)
+#endif
+       VPRINTF("\n\rindex : ")
+       VPRINTX(R_TMP2)
+       VPRINTF("\n\rsp    : ")
        VPRINTX(sp)
        XPUTC('\n')
        XPUTC('\r')