[src/netbsd-1-5]: src/sys/arch/sparc64/sparc64 Pull up revision 1.13 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/3cf93b29f092
branches:  netbsd-1-5
changeset: 491715:3cf93b29f092
user:      he <he%NetBSD.org@localhost>
date:      Wed May 09 20:41:31 2001 +0000

description:
Pull up revision 1.13 (requested by kleink):
  Restore PSR ICC bits correctly from sigcontext.

diffstat:

 sys/arch/sparc64/sparc64/netbsd32_machdep.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r aa165bb25b5f -r 3cf93b29f092 sys/arch/sparc64/sparc64/netbsd32_machdep.c
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep.c       Wed May 09 20:39:29 2001 +0000
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep.c       Wed May 09 20:41:31 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.c,v 1.5.4.3 2000/10/18 16:31:32 tv Exp $      */
+/*     $NetBSD: netbsd32_machdep.c,v 1.5.4.4 2001/05/09 20:41:31 he Exp $      */
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -409,7 +409,7 @@
                return (EINVAL);
 #endif
        /* take only psr ICC field */
-       tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
+       tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(sc.sc_tstate);
        tf->tf_pc = (int64_t)scp->sc_pc;
        tf->tf_npc = (int64_t)scp->sc_npc;
        tf->tf_global[1] = (int64_t)scp->sc_g1;