Module Name: src
Committed By: nakayama
Date: Mon Mar 2 13:58:55 UTC 2015
Modified Files:
src/sys/arch/sparc64/sparc64: locore.s
Log Message:
PANICSTACK is a pointer itself, not a pointer to pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 src/sys/arch/sparc64/sparc64/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.379 src/sys/arch/sparc64/sparc64/locore.s:1.380
--- src/sys/arch/sparc64/sparc64/locore.s:1.379 Mon Mar 2 13:48:00 2015
+++ src/sys/arch/sparc64/sparc64/locore.s Mon Mar 2 13:58:55 2015
@@ -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 @@ winfixspill:
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 @@ slowtrap:
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
