Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/sparc64 PANICSTACK is a pointer itself, not...



details:   https://anonhg.NetBSD.org/src/rev/296522c30842
branches:  trunk
changeset: 336457:296522c30842
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Mon Mar 02 13:58:55 2015 +0000

description:
PANICSTACK is a pointer itself, not a pointer to pointer.

diffstat:

 sys/arch/sparc64/sparc64/locore.s |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 3957e6052352 -r 296522c30842 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Mon Mar 02 13:53:19 2015 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Mon Mar 02 13:58:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.379 2015/03/02 13:48:00 nakayama Exp $    */
+/*     $NetBSD: locore.s,v 1.380 2015/03/02 13:58:55 nakayama Exp $    */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -2145,9 +2145,7 @@
        wrpr    %g0, 0, %otherwin
        or      %lo(2f), %o0, %o0
        wrpr    %g0, WSTATE_KERN, %wstate
-       sethi   %hi(PANICSTACK), %sp
-       LDPTR   [%sp + %lo(PANICSTACK)], %sp
-       add     %sp, -CC64FSZ-STKB, %sp
+       set     PANICSTACK-CC64FSZ-STKB, %sp
        ta      1; nop                                  ! This helps out traptrace.
        call    _C_LABEL(panic)                         ! This needs to be fixed properly but we should panic here
         mov    %g1, %o1
@@ -2927,9 +2925,7 @@
        cmp     %g7, WSTATE_KERN
        bnz,pt  %icc, 1f                ! User stack -- we'll blow it away
         nop
-       sethi   %hi(PANICSTACK), %sp
-       LDPTR   [%sp + %lo(PANICSTACK)], %sp
-       add     %sp, -CC64FSZ-STKB, %sp 
+       set     PANICSTACK-CC64FSZ-STKB, %sp
 1:
 #endif
        rdpr    %tt, %g4



Home | Main Index | Thread Index | Old Index