Module Name: src
Committed By: nakayama
Date: Sun May 15 23:54:58 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64: locore.s
Log Message:
%g1 is not preserved across function call, so load it before
return_from_trap.
To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 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.393 src/sys/arch/sparc64/sparc64/locore.s:1.394
--- src/sys/arch/sparc64/sparc64/locore.s:1.393 Fri May 13 21:48:15 2016
+++ src/sys/arch/sparc64/sparc64/locore.s Sun May 15 23:54:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.393 2016/05/13 21:48:15 palle Exp $ */
+/* $NetBSD: locore.s,v 1.394 2016/05/15 23:54:58 nakayama Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -7078,8 +7078,8 @@ ENTRY(sparc64_ipi_ccall)
call %o5 ! call function
nop
- ba,a return_from_trap ! and return from IPI
- nop
+ b return_from_trap ! and return from IPI
+ ldx [%sp + CC64FSZ + STKB + TF_TSTATE], %g1 ! Load this for return_from_trap
#endif
