[src/trunk]: src/sys/arch/sparc64/sparc64 %g1 is not preserved across functio...

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

details:   https://anonhg.NetBSD.org/src/rev/c376921a1e99
branches:  trunk
changeset: 345269:c376921a1e99
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sun May 15 23:54:58 2016 +0000

description:
%g1 is not preserved across function call, so load it before
return_from_trap.

diffstat:

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

diffs (20 lines):

diff -r 64f7f7887b25 -r c376921a1e99 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Sun May 15 23:54:19 2016 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Sun May 15 23:54:58 2016 +0000
@@ -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 @@
        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